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

removed Ruediger's no longer valid -1.


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

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

apachectl configtest or httpd -t doesn't show a list of config files

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

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

* Convert request time to seconds before before storing it in unique_id_rec
  struct.

PR: 37064
Submitted by: Kobayashi <kobayashi firstserver.co.jp>
Reviewed by: rpluem, jim, pquerna


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

Improve salt string generation.

Submited by: Andreas Krennmair <ak synflood.at>

Improve generation of the seed to rand, by using apr_generate_random_bytes, 
rather than the current time as a seed.

Fix printing of error message.

* support/htpasswd.c (seed_rand): Fix compiler warning.

PR: 31440
Reviewed by: rpluem, jim, pquerna


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

* Add the filename of the configuration file to the warning message
  about the useless use of AllowOverride.

PR: 39992
Submitted by: Darryl Miles <darryl darrylmiles.org>
Reviewed by: rpluem, jim, pquerna


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

* Add the filename of the configuration file to the warning message
  about the useless use of AllowOverride.

PR: 39992
Submitted by: Darryl Miles <darryl darrylmiles.org>
Reviewed by: rpluem, jim, pquerna


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

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

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

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

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

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

Submitted by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>

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

* server/mpm/prefork/prefork.c (child_main): If apr_pollset_poll()
  fails with EINTR and die_now has been set (indicating a graceful
  stop/restart), terminate the child quickly rather than re-entering
  poll().

Submitted by: jorton
Reviewed by: jim


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

* server/mpm/prefork/prefork.c (child_main): Unlock the mutex before
  terminating in the multi-listener poll error path.

Submitted by: jorton
Reviewed by: jim


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

* server/mpm/prefork/prefork.c (child_main): Stop processing new
connections if shutdown_pending is set, i.e. when SIGTERM is received
in single-proecss mode.

Submitted by: Garrett Rooney <rooneg apache.org>
PR: 38848

Submitted by: jorton
Reviewed by: jim


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

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