View | Details | Raw Unified | Return to bug 61234
Collapse All | Expand All

(-)CHANGES (+3 lines)
Lines 1-6 Link Here
1
                                                         -*- coding: utf-8 -*-
1
                                                         -*- coding: utf-8 -*-
2
Changes with Apache 2.5.0
2
Changes with Apache 2.5.0
3
3
4
  *) mod_proxy: Add X-Forwarded-Proto header to backend requests when
5
     ProxyAddHeaders is enabled. [Christian Schmidt]
6
4
  *) core: Avoid duplicate HEAD in Allow header.
7
  *) core: Avoid duplicate HEAD in Allow header.
5
     This is a regression in 2.4.24 (unreleased), 2.4.25 and 2.4.26.
8
     This is a regression in 2.4.24 (unreleased), 2.4.25 and 2.4.26.
6
     PR 61207. [Christophe Jaillet]
9
     PR 61207. [Christophe Jaillet]
(-)docs/manual/mod/mod_proxy.html.en (-1 / +4 lines)
Lines 475-480 Link Here
475
    <dl>
475
    <dl>
476
      <dt><code>X-Forwarded-For</code></dt>
476
      <dt><code>X-Forwarded-For</code></dt>
477
      <dd>The IP address of the client.</dd>
477
      <dd>The IP address of the client.</dd>
478
      <dt><code>X-Forwarded-Proto</code></dt>
479
      <dd>The original protocol used by the client, either <code>http</code>
480
       or <code>https</code>.</dd>
478
      <dt><code>X-Forwarded-Host</code></dt>
481
      <dt><code>X-Forwarded-Host</code></dt>
479
      <dd>The original host requested by the client in the <code>Host</code>
482
      <dd>The original host requested by the client in the <code>Host</code>
480
       HTTP request header.</dd>
483
       HTTP request header.</dd>
Lines 777-783 Link Here
777
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.10 and later</td></tr>
780
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.10 and later</td></tr>
778
</table>
781
</table>
779
    <p>This directive determines whether or not proxy related information should be passed to the
782
    <p>This directive determines whether or not proxy related information should be passed to the
780
    backend server through X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server HTTP headers.</p>
783
    backend server through X-Forwarded-For, X-Forwarded-Scheme, X-Forwarded-Host and X-Forwarded-Server HTTP headers.</p>
781
    <div class="note"><h3>Effectiveness</h3>
784
    <div class="note"><h3>Effectiveness</h3>
782
     <p>This option is of use only for HTTP proxying, as handled by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>.</p>
785
     <p>This option is of use only for HTTP proxying, as handled by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>.</p>
783
    </div>
786
    </div>
(-)docs/manual/mod/mod_proxy.xml (-1 / +5 lines)
Lines 450-455 Link Here
450
    <dl>
450
    <dl>
451
      <dt><code>X-Forwarded-For</code></dt>
451
      <dt><code>X-Forwarded-For</code></dt>
452
      <dd>The IP address of the client.</dd>
452
      <dd>The IP address of the client.</dd>
453
      <dt><code>X-Forwarded-Proto</code></dt>
454
      <dd>The original protocol used by the client, either <code>http</code>
455
       or <code>https</code>.</dd>
453
      <dt><code>X-Forwarded-Host</code></dt>
456
      <dt><code>X-Forwarded-Host</code></dt>
454
      <dd>The original host requested by the client in the <code>Host</code>
457
      <dd>The original host requested by the client in the <code>Host</code>
455
       HTTP request header.</dd>
458
       HTTP request header.</dd>
Lines 2027-2033 Link Here
2027
2030
2028
<usage>
2031
<usage>
2029
    <p>This directive determines whether or not proxy related information should be passed to the
2032
    <p>This directive determines whether or not proxy related information should be passed to the
2030
    backend server through X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server HTTP headers.</p>
2033
    backend server through X-Forwarded-For, X-Forwarded-Scheme, X-Forwarded-Host and
2034
    X-Forwarded-Server HTTP headers.</p>
2031
    <note><title>Effectiveness</title>
2035
    <note><title>Effectiveness</title>
2032
     <p>This option is of use only for HTTP proxying, as handled by <module>mod_proxy_http</module>.</p>
2036
     <p>This option is of use only for HTTP proxying, as handled by <module>mod_proxy_http</module>.</p>
2033
    </note>
2037
    </note>
(-)modules/http2/h2_proxy_session.c (+6 lines)
Lines 752-757 Link Here
752
            apr_table_mergen(stream->req->headers, "X-Forwarded-For",
752
            apr_table_mergen(stream->req->headers, "X-Forwarded-For",
753
                             r->useragent_ip);
753
                             r->useragent_ip);
754
754
755
            /* Add X-Forwarded-Proto: so that the upstream knows whether
756
             * the original request used HTTPS.
757
             */
758
            apr_table_mergen(stream->req->headers, "X-Forwarded-Proto",
759
                             ap_http_scheme(r));
760
755
            /* Add X-Forwarded-Host: so that upstream knows what the
761
            /* Add X-Forwarded-Host: so that upstream knows what the
756
             * original request hostname was.
762
             * original request hostname was.
757
             */
763
             */
(-)modules/proxy/proxy_util.c (+6 lines)
Lines 3629-3634 Link Here
3629
            apr_table_mergen(r->headers_in, "X-Forwarded-For",
3629
            apr_table_mergen(r->headers_in, "X-Forwarded-For",
3630
                             r->useragent_ip);
3630
                             r->useragent_ip);
3631
3631
3632
            /* Add X-Forwarded-Proto: so that the upstream knows whether
3633
             * the original request used HTTPS.
3634
             */
3635
            apr_table_mergen(r->headers_in, "X-Forwarded-Proto",
3636
                             ap_http_scheme(r));
3637
3632
            /* Add X-Forwarded-Host: so that upstream knows what the
3638
            /* Add X-Forwarded-Host: so that upstream knows what the
3633
             * original request hostname was.
3639
             * original request hostname was.
3634
             */
3640
             */

Return to bug 61234