delta/apache/httpd.git/modules/proxy/mod_proxy_connect.c, branch 2.4.17-protocols-changes

Merge r1657636, r1657638, r1669130 from trunk:

2015-03-31T12:53:00+00:00

mod_proxy_connect/wstunnel: If both client and backend sides get readable
at the same time, don't lose errors occuring while forwarding on the first
side when none occurs next on the other side, and abort.


CHANGES: Follow up to r1657636, clarify message.


mod_proxy_{connect,wstunnel}: follow up to r1657636.
Since rv is not used as an apr_status_t in the loop (it's logging is done by
proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean
instead to avoid the ugly ORs between APR error codes.

Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1670324 13f79535-47bb-0310-9956-ffa450edef68

Merge r1656230 from trunk

2015-02-21T09:20:19+00:00

   * mod_proxy_connect: fix duplicated AH introduced by r1635645
      (and merged to 2.4.11 in r1642857)

Submitted by: ylavic
Reviewed by: ylavic, jailletc36, minfrin
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1661305 13f79535-47bb-0310-9956-ffa450edef68

Merge r1635645 from trunk:

2014-12-02T12:48:24+00:00

mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read
determine whether it is a normal close or a real error. PR 57168.

Abort the client or backend connection on polling errors, but don't forcibly
abort the client side at the end (the core filters will do that otherwise
when necessary), so that lingering close and SSL shutdown can occur on normal
close.

Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1642857 13f79535-47bb-0310-9956-ffa450edef68

modules: Fix some compiler warnings.

2013-09-14T14:44:23+00:00

trunk patch: http://svn.apache.org/r1500345
             http://svn.apache.org/r1500362
             http://svn.apache.org/r1500423
             http://svn.apache.org/r1500483
             http://svn.apache.org/r1500519

Submitted by: fuankg
Reviewed by: jim, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1523259 13f79535-47bb-0310-9956-ffa450edef68

Merge r1442320 from trunk:

2013-02-06T17:13:59+00:00

Don't keepalive the connection to the client if the
backend closes the connection.

PR: 54474
Submitted by: Pavel Mateja 

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1443075 13f79535-47bb-0310-9956-ffa450edef68

proxy_connect_handler: fix use of APLOGNO() (backport r1375407).

2012-09-18T01:39:57+00:00

Submitted by: jorton
Reviewed/backported by: sf, fuankg



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1386952 13f79535-47bb-0310-9956-ffa450edef68

* mod_proxy*: ProxyBlock fixes; PR 43697 and more.

2012-07-28T14:40:23+00:00

        trunk patch: http://svn.apache.org/viewvc?rev=1365001&view=rev and
                          http://svn.apache.org/viewvc?rev=1365020&view=rev and
                                            http://svn.apache.org/viewvc?rev=1365029&view=rev
                                                 2.4.x patch: http://people.apache.org/~jorton/ap_proxyblock-24x-v2.diff [avoids major MMN bump]
                                                      +1: jorton, rjung, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1366693 13f79535-47bb-0310-9956-ffa450edef68

Backport r1209766, r1210252, r1210284:

2011-12-05T00:08:01+00:00

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG
to TRACE1-3


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210287 13f79535-47bb-0310-9956-ffa450edef68

Backport r1203859:

2011-11-18T21:44:43+00:00

great proxy logging cleanup:
    
  * remove "proxy:", "FCGI", etc. prefixes and pid which are now
    included in the error log format

  * propagate frontend request's logconfig to backend request
    
  * use ap_log_rerror where possible
    
  * remove obsolete APLOG_NOERRNO


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1203861 13f79535-47bb-0310-9956-ffa450edef68

Cleanup effort in prep for GA push:

2011-09-23T13:39:32+00:00

Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68