delta/apache/httpd.git/server, branch httpd-2.2-proxy

Merge r732421, r732451 from trunk:

2009-01-31T20:54:55+00:00

Release the accept mutex after receiving the shutdown signal
in single-process mode.  (That isn't a critical step, but
neatness counts.)

Submitted by: rpleum



prefork: Fix child process hang during graceful restart/stop in
configurations with multiple listening sockets.

PR: 42829
Submitted by: Joe Orton, with some tweaking and testing from me

Reviewed by: trawick, rpluem, jorton, pgollucci



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

Merge r732832, r733134, r733218 from trunk:

2009-01-12T14:03:38+00:00

Translate locally generated "100-Continue" message to
ASCII on EBCDIC systems.


EBCDIC fix for ap_send_interim_response()



simplifications per niq's review comments

Submitted by: covener
Reviewed/backported by: jim


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

Merge r729586, r732504 from trunk:

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

CGI: return 504 (Gateway timeout) rather than 500 when a script
times out before returning status line/headers.
PR 42190


Improve canned 504 error message in the light of r729586 and covener's comment.

Submitted by: niq
Reviewed/backported by: jim


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

PR 45959

2009-01-12T13:53:43+00:00

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

Merge r732414 from trunk:

2009-01-12T11:37:32+00:00

As jorton discovered, recent Linux kernels have a new tunable
setting for epoll that will trip up many prefork users.  Write
a log message instead of crashing.

As rpluem notes, some Apache doc is in order.

PR: 46467
Submitted by: trawick
Reviewed by: rpluem, covener, trawick


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

Backport r730296: fix for HTML entity escaping in mod_include,

2009-01-08T01:24:16+00:00

including enhancement of ap_escape_html API.


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

Commit promoted backport of PR 46066.

2008-12-18T17:22:54+00:00

  *) Set Listen protocol to "https" if port is set to 443 and no proto is specified
     (as documented but not implemented). PR 46066  [Dan Poirier ]


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

Merge r727452 from trunk:

2008-12-18T01:46:00+00:00

Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.

Submitted by: Dan Poirier 
Reviewed by: rederpj, covener, rpluem


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

Merge r722213,r722081, and r721679 from trunk:

2008-12-02T22:28:21+00:00

* Avoid sending no answer at all if a custom error page causes an
  AP_FILTER_ERROR.

* allow ap_invoke_handler() to pass-through AP_FILTER_ERROR as if it were
  a reserved status code (OK/DECLINED/SUSPENDED). Prevents ap_die() from seeing a
  500 error when the http header filter has already taken care of the proper
  error response

* To be safe, consume the entire brigade after processing an error bucket in
  the HTTP output filter.



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

Merge r719357 from trunk:

2008-11-24T13:54:50+00:00

Fix MaxRequestsPerChild on the Event MPM.  It hasn't worked for 4 years.

* server/mpm/experimental/event/event.c
    (process_socket): Be consistent about our return value, returning 0
      means this connection is done, and that we can decrement requests_this_child.

Submitted by: pquerna
Reviewed by: jim


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