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

English Revision: 421100

Submitted by: kawai
Reviewed by: takashi

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

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

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

*  mod_proxy_http.c
   Ensure that the EOC bucket is inserted BEFORE an EOS bucket in bb as
   some resource filters like mod_deflate pass everything up to the EOS
   down the chain immediately and sent the remainder of the brigade later
   (or even never). But in this case the ap_http_header_filter does not
   get out of our way soon enough.

   http_filters.c
   Remove all data buckets that are in a brigade after an EOC bucket
   was seen, as an EOC bucket tells us that no (further) resource
   and protocol data should go out to the client. OTOH meta buckets
   are still welcome as they might trigger needed actions down in
   the chain (e.g. in network filters like SSL).
   Remark 1: It is needed to dump ALL data buckets in the brigade
             since an filter in between might have inserted data
             buckets BEFORE the EOC bucket sent by the original
             sender and we do NOT want this data to be sent.
   Remark 2: Dumping all data buckets here does not necessarily mean
             that no further data is send to the client as:
             1. Network filters like SSL can still be triggered via
                meta buckets to talk with the client e.g. for a
                clean shutdown.
             2. There could be still data that was buffered before
                down in the chain that gets flushed by a FLUSH or an
                EOS bucket.

PR: 37770

Submitted by: rpluem
Reviewed by: jim


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

* Check for failure of apr_file_info_get call

Reported By: BOYA SUN <boya.sun case.edu>

Submitted by: rpluem
Reviewed by: jim


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

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

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

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

When group is given as a numeric gid, validate it by looking up the
actual group name such that the name can be used in log entries.

PR: 7862
Submitted by: <y-koga apache.or.jp>, Leif W <warp-9.9 usa.net>
Reviewed by: fielding, jim, rpluem


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

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

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

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

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

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

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

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

The response to the TRACE method is partially garbled on an EBCDIC platform.
Send the request line and trailing CRLF in ASCII.

Submitted by:           David Jones <oscaremma gmail.com>
Reviewed and tested by: gregames



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

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

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

* Include <limits.h> earlier if available since INT_MAX is defined there on
  Windows and we need INT_MAX already for the definition of MAX_REQUESTS.

PR: 45024


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

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

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

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

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

* Do not allow all options of ALL to be set when only a few of them are
  allowed.

PR: 44262
Submitted by: Micha?\197?\130 Grz?\196?\153dzicki <lazy iq.pl>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim


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

* Restore the original request headers if the cached resource was stale, as they
  may be needed by further output filters like the byterange filter to make the
  correct decisions.

PR: 44579


* Do not do Range requests if we use our own conditionals for validating
  a cache entity: If we get 304 the Range does not matter and otherwise the
  entity changed and we want to have the complete entity.

PR: 44579

Submitted by: rpluem
Reviewed by: jim


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

* Do not retry a direct connection if the request has a request body

Submitted by: rpluem
Reviewed by: jim


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

* Do not retry a request in the case that we either failed to sent a part of the
  request body or if the request is not idempotent.

PR: 44334


* As per niq's comment, better destinct the types of idempotence.


* Introduce a flag to decide whether we sent an body to the backend or not.

Submitted by: rpluem
Reviewed by: jim


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

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

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

==================
r390504,i r390511, r390519, r394765, r395228, r396300, r413861 | colm

Give users the ability to set the window size for apache bench runs. Useful
for benchmarking largefile downloads.

  * Add siege-like behaviour to ApacheBench; output the results, as they have
    accrued so far, when the user interrupts with ctrl-c. As the signal handler
    is non-reentrant, we don't need volatiles, and the operations all look
    signal-safe.

  * Update the base version, since handling a signal differently is an external
    API change of sorts.

  * set the LastChangedRevision svn property, as ab.c has $Rev $ embedded, so
    it really should be.

when compiling statistics, only interate accross requests which occured.

A keepalive response need not neccessarily have included any content-length
header, handle this case properly for 304 responses. PR39789

==================
r516175 | trawick

ab: Add -r option to continue after socket receive errors.

Submitted by: Filip Hanik <devlist hanik.com>
Reviewed by: trawick

==================
r541138 | sctemme

Explain that POST data should be sent as the correct MIME type.
Submitted by Vincent Bray noodlet at gmail dot com,
edited and reviewed by sctemme

==================
r655214 | fielding

Overhaul ab.c stats collection and reporting to avoid integer
truncation and time divisions within the test loop, retain
native time resolution until output, remove unused data,
avoid structure copies, consistently round milliseconds, and
generally avoid losing accuracy of calculation due to type casts.

Incidentally fixes output bug on gnuplot (seconds were being
output as microseconds).  It would make more sense to output
gnuplot stats as microseconds after the start of test, but
this change returns us to consistency with pre-apr versions of ab.

PR: 44878, 44931.

==================
r655637 | fielding

Don't stop sending a request if EAGAIN is returned, which will only
happen if both the write and subsequent wait are returning EAGAIN,
and count posted bytes correctly when the initial write of a request
is not complete.

PR 10038, 38861, 39679
Submitted by: Patrick McManus <mcmanus datapower.com> (in 2003)
              Stefan Fleiter <stefan.fleiter web.de>  (in 2006)
              and Davanum Srinivas (in 2006).  Committed patch
              contains parts of all three, tweaked by Roy (2008).

==================
r655654 | fielding

Improve client performance by clearing connection pool instead
of destroying it.

PR 40054
Submitted by: Brad Roberts <braddr puremagic.com>


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

* Initialize hash needed by ap_register_rewrite_mapfunc early enough.

PR: 44641
Submitted by: Daniel Lescohier <daniel.lescohier cnet.com>
Reviewed by: rpluem, niq, wrowe, jim

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick


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

* Prevent a segfault if the destination URI of a copy / move operation is
  not under DAV control. Return 405 (Method not allowed) instead.

PR: 44734

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick


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

* Only send 100-continue if the status code so far indicates success.

PR: 43711

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick


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

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@660560 13f79535-47bb-0310-9956-ffa450edef68

PR: 44713

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

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

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

submitted by: Lucien GENTIS <lucien.gentis lorraine.iufm.fr>

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