<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/19782">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span></span><br></pre><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Boris P. Korzun: Looks good to me, but someone else must approve
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">http.c: Minor simplification to HTTP status output.<br><br>Change the HTTP status page (located at /httpstatus by default) by:<br><br>* Combining the address and port into a single line.<br>* Changing "SSL" to "TLS"<br><br>ASTERISK-30433 #close<br><br>Change-Id: Id2ccb1218f00a68424aca2b651647d8b1f549bcb<br>---<br>A doc/CHANGES-staging/http_bindaddr.txt<br>M main/http.c<br>2 files changed, 25 insertions(+), 5 deletions(-)<br><br></pre>
<pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/CHANGES-staging/http_bindaddr.txt b/doc/CHANGES-staging/http_bindaddr.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..e83312b</span><br><span>--- /dev/null</span><br><span>+++ b/doc/CHANGES-staging/http_bindaddr.txt</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: http</span><br><span style="color: hsl(120, 100%, 40%);">+Master-Only: True</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+For bound addresses, the HTTP status page now combines the bound</span><br><span style="color: hsl(120, 100%, 40%);">+address and bound port in a single line. Additionally, the SSL bind</span><br><span style="color: hsl(120, 100%, 40%);">+address has been renamed to TLS.</span><br><span>diff --git a/main/http.c b/main/http.c</span><br><span>index 80c00c5..c07a898 100644</span><br><span>--- a/main/http.c</span><br><span>+++ b/main/http.c</span><br><span>@@ -398,13 +398,11 @@</span><br><span>   ast_str_append(&out, 0, "<tr><td><i>Prefix</i></td><td><b>%s</b></td></tr>\r\n", prefix);</span><br><span>  if (global_http_server) {</span><br><span>            ast_str_append(&out, 0, "<tr><td><i>Bind Address</i></td><td><b>%s</b></td></tr>\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                               ast_sockaddr_stringify_addr(&global_http_server->args.old_address));</span><br><span style="color: hsl(0, 100%, 40%);">-              ast_str_append(&out, 0, "<tr><td><i>Bind Port</i></td><td><b>%s</b></td></tr>\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                          ast_sockaddr_stringify_port(&global_http_server->args.old_address));</span><br><span style="color: hsl(120, 100%, 40%);">+                           ast_sockaddr_stringify(&global_http_server->args.old_address));</span><br><span>        }</span><br><span>    if (http_tls_cfg.enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">-             ast_str_append(&out, 0, "<tr><td><i>SSL Bind Port</i></td><td><b>%s</b></td></tr>\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                              ast_sockaddr_stringify_port(&https_desc.old_address));</span><br><span style="color: hsl(120, 100%, 40%);">+             ast_str_append(&out, 0, "<tr><td><i>TLS Bind Address</i></td><td><b>%s</b></td></tr>\r\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                         ast_sockaddr_stringify(&https_desc.old_address));</span><br><span>         }</span><br><span>    ast_str_append(&out, 0, "<tr><td colspan=\"2\"><hr></td></tr>\r\n");</span><br><span>   for (v = get_vars; v; v = v->next) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/19782">change 19782</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/19782"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id2ccb1218f00a68424aca2b651647d8b1f549bcb </div>
<div style="display:none"> Gerrit-Change-Number: 19782 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Boris P. Korzun <drtr0jan@yandex.ru> </div>
<div style="display:none"> Gerrit-Reviewer: Boris P. Korzun <drtr0jan@yandex.ru> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: N A <asterisk@phreaknet.org> </div>
<div style="display:none"> Gerrit-CC: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>