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

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

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

of master_main and was orphaned on each soft or fatal restart.

PR: 40932 
Submitted by: Jeff Robbins <jeffr livedata.com>

Backport: r607677

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

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

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

child's read end for a reliable piped logger.  The child runs
and manages it's own logs, and even if the parent did instead, 
the mpm would be adjusted to pass down the child write ends 
without read ends to the pipes, so this forever makes no sense.

Backport: r607666

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

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

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

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

pool, instead of exhausting pchild memory over a number of
connections.

PR: 11427
Submitted by: Alex Varju <alex varju.ca>
Backport: r607393

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

specific server/log.c r602467, take into account the fact that 
apr's flags could not be adjusted.

Backports: 2.2.x branch r607311

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

time lookup, eliminating the bogus/misimplemented function,
and introducing fairness to release any dead threads before
getting hung up on releasing longer lived threads.

Also pick up the time-to-wait from the server global timeout.

And finally, axe a completely bogus internal helper function.

Backports: r573103, r573105

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

and taking better advantage of apr's now-proper support.

Already verified by Randy Kobes and Tom Donovan

Sync to trunk r580433

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

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

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

      binaries (especially when compiled --with-static-support (!)) and
          fix mod_ssl.so to compile against .a openssl archives.
                http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev
                    adjusted patch without distcache complexity and accomodating the
                        changes for pkgconfig info from ssl
                              http://people.apache.org/~wrowe/httpd-2.0-limit-ssl-binding.patch
                                  +1: wrowe, colm, rpluem



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

    Trunk:
      http://svn.apache.org/viewvc?view=rev&revision=226777
    2.0.x:
      Patch submitted via PR 42035 by Dominique Quatravaux 
      http://issues.apache.org/bugzilla/attachment.cgi?id=19901
    +1: trawick, rpluem, wrowe



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

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

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

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

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

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

instances, and disconnect computer function on multi-system
applications of ApacheMonitor.

PR: 33803
Reported by: K.W.Schick <drax sawebs.com>
Backport: 606481


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

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

Backports r605397


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

httpd+openssl binary.

Backport: r604940

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

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@604441 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.

Reviewed by: wrowe, rpluem


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

 http_protocol: Escape request method in 413 error reporting.
 Determined to be not generally exploitable, but a flaw in any case.
 PR 44014

Submitted by: Victor Stinner <victor.stinner inl.fr>
Reviewed by: wrowe, rpluem, trawick


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

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

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

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

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

Share a single write-pipe handle for piped stderr logging, this
prevents an extra logging process from hanging around after the
initial config-phase.

Reviewed by: rpluem, wrowe
Submitted by: wrowe
Reviewed by: jim


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

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

mop-up in place)


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

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

Fix CVE-2007-5000:

* modules/mappers/mod_imap.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
Reviewed by: jorton, rpluem, trawick


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