Skip to content
  1. Mar 27, 2015
    • Jim Jagielski's avatar
      Merge r1658760 from trunk: · e32be8a2
      Jim Jagielski authored 
      mod_proxy_http: Don't expect the backend to ack the "Connection: close" to
finally close those not meant to be kept alive by SetEnv proxy-nokeepalive
or force-proxy-request-1.0, and respond with 502 instead of 400 if its
Connection header is invalid.

Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1669558 13f79535-47bb-0310-9956-ffa450edef68
      e32be8a2
    • Jim Jagielski's avatar
      Merge r1665215, r1665218 from trunk: · 296ff2b5
      Jim Jagielski authored 
      mod_proxy: use the original (non absolute) form of the request-line's URI
for requests embedded in CONNECT payloads used to connect SSL backends via
a ProxyRemote forward-proxy. PR 55892.

Submitted by: Hendrik Harms <hendrik.harms gmail com>
Reviewed  by: wrowe, ylavic
Committed by: ylavic


mod_proxy: follow up to r1665215: CHANGES entry.
Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1669556 13f79535-47bb-0310-9956-ffa450edef68
      296ff2b5
    • Jim Jagielski's avatar
      Merge r1619383, r1619444, r1662245, r1662246 from trunk: · 75b6100c
      Jim Jagielski authored 
      A misplaced check for inflation limits prevented limiting relatively
small inputs.  PR56872

Submitted By: Edward Lu 
Committed By: covener



mod_deflate: follow up to r1619383.

deflate_in_filter():
- use inflated bytes per inflate() call to compute the total output bytes,
- check zlib errors before limits,
- add missing check_ratio() when asked to flush.

deflate_out_filter():
- check ratio after each inflate() call.


mod_deflate: follow up to r1619383 and r1619444: CHANGES entry.

CHANGES: follow up to r1662245: Add PR number.
Submitted by: covener, ylavic, ylavic, ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1669555 13f79535-47bb-0310-9956-ffa450edef68
      75b6100c
  3. Mar 24, 2015
  5. Mar 05, 2015
  7. Mar 04, 2015
  9. Mar 02, 2015
  11. Feb 27, 2015
  13. Feb 24, 2015
    • Rainer Jung's avatar
      Merge r1661067 from trunk: · 4fbebb2c
      Rainer Jung authored 
      mod_proxy_ajp: Forward SSL protocol name (SSLv3, TLSv1.1 etc.) as a
request attribute to the backend. The name is taken from
the SSL_PROTOCOL env var. Recent Tomcat versions will extract
it and provide it as a servlet request attribute named
"org.apache.tomcat.util.net.secure_protocol_version". 

The change is compatible with existing AJP13, because we forward
the protocol name as a normal named attribute, not with a new
byte abbreviated attribute name.

Submitted by: rjung
Reviewed by: rjung, ylavic, covener
Backported by: rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1662076 13f79535-47bb-0310-9956-ffa450edef68
      4fbebb2c
    • Rainer Jung's avatar
      Merge r1657685 from trunk: · ad4d59a6
      Rainer Jung authored 
      core: Optimize string concatenation in expression
parser when evaluating a string expression.

We have a relatively small recursion limit of
about 10 operations. This is a compilation
limit (a define). It can be hit if many expr
vars or function calls are concatenated in an
expression that is evaluated as a string not as
a boolean.

The new optimization uses iteration instead of
recursion and is very similar to the
existing one, which optimizes consecutive
concatenations in node2 of the tree. The new
one optimizes consecutive concatenations in
node 1.

Submitted by: rjung
Reviewed by: rjung, ylavic, covener
Backported by: rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1662075 13f79535-47bb-0310-9956-ffa450edef68
      ad4d59a6
    • Christophe Jaillet's avatar
      Merge r1652930, r1652933 from trunk · 672ad4d6
      Christophe Jaillet authored 
         * acinclude.m4: Generate #LoadModule directive in default httpd.conf for
                   every --enable-mpms-shared. PR 53882.

Submitted by: olli hauer <ohauer gmx.de>, Yann Ylavic
Reviewed by: ylavic, rjung, jailletc36
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1661848 13f79535-47bb-0310-9956-ffa450edef68
      672ad4d6
  15. Feb 23, 2015
  17. Feb 22, 2015
  19. Jan 28, 2015
  21. Jan 22, 2015
  23. Jan 19, 2015
  25. Jan 15, 2015
  27. Jan 14, 2015
  29. Jan 12, 2015