delta/apache/httpd.git/modules/proxy/mod_proxy_http.c, branch httpd-2.2-proxy

More trunk backporting

2009-08-31T11:41:33+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@809545 13f79535-47bb-0310-9956-ffa450edef68

Oh joy. Fold in backportable proxy changes/improvements

2009-05-06T14:33:45+00:00

from trunk as of r772279



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772280 13f79535-47bb-0310-9956-ffa450edef68

Merge r733127, r733219 from trunk:

2009-01-12T13:56:19+00:00

pass a server_rec to ap_log_error on two interim response messages
 


use ap_log_rerror instead of r->server per niq's comments

Submitted by: covener
Reviewed/backported by: jim


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

*) mod_proxy: Prevent segmentation faults by correctly adjusting the lifetime

2008-11-11T20:04:34+00:00

     of the buckets read from the proxy backend. PR 45792 [Ruediger Pluem]



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

Merge r707163 from trunk:

2008-11-11T20:00:10+00:00

Remove potential for memory leak... allocate on this
request which is now viable due to connection pooling.

Reviewed by: jim


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

Merge r697362 from trunk:

2008-09-28T15:36:44+00:00

For timeouts, behave as before and not drop.
Submitted by: Adam Woodworth 
Reviewed by: jim, rpluem, covener



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

Merge r684351, r686549 from trunk:

2008-09-02T13:07:50+00:00

* Introduce environment variable proxy-initial-not-pooled to avoid reusing
  pooled connections if the client connection is an initial connection.
  This avoids the "proxy: error reading status line from remote server"
  error caused by the race condition that the backend server closed the
  connection after the connection check on our side and before our data
  reached the backend. Yes, this downgrades performance, especially with
  HTTP/1.0 clients. Hence it is configurable and off by default.

PR: 37770


* Add missing documentation for proxy-initial-not-pooled (r684351).



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

Merge r661506 from trunk:

2008-07-19T18:55:48+00:00

* According to RFC 2616 8.2.3 we are not allowed to forward an
  Expect: 100-continue to an HTTP/1.0 server. Instead we MUST return
  a HTTP_EXPECTATION_FAILED.

Submitted by: rpluem
Reviewed by: jim, rpluem, niq


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

Backport... use approvals from the sec list to

2008-06-10T17:39:38+00:00

allow for backport here.

Merge r666154, r666180 from trunk:

Patch for CVE-2008-2364...


move back to inner loop... fails otherwise

Reviewed by: jim


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

Merge r649169, r649239, r649840, r649922, r650026, r661452, r661459 from trunk:

2008-06-05T12:46:43+00:00

Make mod_proxy_ajp aware of the nocanon envvar


handle ? in cases where nocanon is in effect


* Do not add the query string again in the case that we are using the
  unparsed uri.

PR: 44803


Set at init time, and combine comments


Typo.


* Do not add the query string again in the case that we are using the
  unparsed uri.

PR: 44803


* Set at init time and combine comments.

Reviewed by: jim


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