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

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

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

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

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

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

when linking against apr-util-1.2.

Backports: 663663
Reviewed by: rpluem, fielding, minfrin, 


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

since it is not implemented (yet?).
Please revert this when it is implemented.

PR: 44901

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

core: Fix address-in-use startup failure on some platforms caused
by attempting to set up an IPv4 listener which overlaps with an 
existing IPv6 listener.

The failure occurred on the second pass of the open-logs hook in
a configuration such as the following:

  Listen 8080
  Listen 0.0.0.0:8081
  Listen [::]:8081

During the first pass, the two port 8081 listen recs were 
adjacent and existing logic prevented binding to 0.0.0.0:8081.
On the second pass, they were not adjacent and we then tried
to bind to 0.0.0.0:8081, leading to failure on some platforms
(seen on SLES 9 and Ubuntu 7.10, not seen on many other Unix-ish
platforms).

Leave a note about other unhandled configurations.

Submitted by: trawick
Reviewed by: jim


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

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

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

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

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

conditionally build DBD_LIST members.

Backport: 664253

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

are undecorated, their .h files are not propagated into
an installed include/ tree, and were erroniously exported.

This doesn't require an mmn bump, because anyone who might
have consumed these modules would have succeeded only with
win32, consuming private headers, and absolutely fails on unix.


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

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

However; why are hook registrations being exported at
all, most registered functions should be static.

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

_NONSTD refers to type fn(arg, arg, ...) incomplete declarations

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

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

Add a few '/' and remove an errant '>'.

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

Submitted by: tdonovan
Backports: r664023


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

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

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

wordsmithing


Merge r409455 from trunk:
* Add a note about trailing slashes for ProxyPass and fix the balancer example
  accordingly.

PR: 39203

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

Add a usage example to mod_proxy_balancer.

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

since "Support for Additional Languages" needs to be enabled
in the installation of JRE to read ISO-2022-JP.

Reviewed by: kawai

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

stdout channel; do not close stdout in the parent process or reassign it to
\\Device\Null, but keep it open so that the console signal handler continues
to interact with the running "daemonized" httpd process.

Not committed to httpd-2.x; there is disagreement as to whether this is good
behavior for a daemon, and the proper 2.4(3.0) behavior on Win32 may be to
daemonize but properly handle -k stop by the PID file contents.  Many have
asked for this feature who run a minimal httpd.exe, especially from some
removeable media such as CD, and wish to be able to halt it as a console. 

PR: 44800 (part 3/3)
Submitted by: tdonovan


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

the passed env argument on each CreateProcess call.

PR: 44800 (part 2/3)
Submitted by: tdonovan
Backports: r663699


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

even on a restart, because some modules (e.g. mod_perl) might have set a console
handler to terminate the process.

PR: 44800 (part 1/3)
Submitted by: tdonovan
Backports: r663669


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

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

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

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

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

Prevent CSRF attacks against the balancer-manager (CVE-2007-6420)

* modules/proxy/mod_proxy_balancer.c (balancer_init): New function.
  (balancer_handler): Place a nonce in the form output, and check that
  the submitted form data includes that nonce.
  (ap_proxy_balancer_register_hook): Register the new post_config hook.

Submitted by: jorton
Reviewed by: jim


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

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

may observe the noonce value itself.  But because no sane administrator should
expose this interface to the general public, the solution seems sane.


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

should be resolved.


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

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

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

follow r662725

Submitted by: Nilgün Belma Bugüner <nilgun belgeler.gen tr>

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