Backports: r606251

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

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

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

Backports: r606158

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

Note the quotes for "logs/access_log" which let us
toggle this to access.log, while leaving the custom
log format specifier pretty_log alone.

Also, prefer the user specified port for example
ServerName directive.

Backports: r606135


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

Borrowing the msi installer script as a starting point, ensure
we use the same configuration rewrite engine for the msi and the
local build.  Prepares us to share httpd.conf.in with all platforms.

Backport: r606136, 606156, 606157


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

Noted by Ruediger, thanks for this catch.


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

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

library pdb's the same as their correponding .lib's.

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

Backports r605397

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

Backports r605395

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

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

and forgotten from backports

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

httpd+openssl binary.

Backport: r604940

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

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

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

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

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

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

  parsing by ensuring that it always has a \0 at the end.

PR: PR 44073
Submitted by: yl <yl bee-ware.net>
Reviewed by: rpluem, jorton, trawick


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

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

http_protocol: Escape request method in 405 error reporting.
This has no security impact since the browser cannot be tricked
into sending arbitrary method strings.

(words from jorton)

Submitted by: trawick
Reviewed by: jim


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

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

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

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

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

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

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

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

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

* modules/mappers/mod_imagemap.c (menu_header): Fix
  cross-site-scripting issue by escaping the URI, and ensure that a
  charset parameter is sent in the content-type to prevent
  autodetection by broken browsers.

Reported by: JPCERT

Backports: r603282
Submitted by: jorton
Reviewed by: rpluem, trawick, wrowe


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

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

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

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

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

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

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

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

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

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