]> granicus.if.org Git - apache/log
apache
8 years agoWe didn't change the MODULE_MAGIC_NUMBER_MAJOR
Jim Jagielski [Fri, 5 Aug 2016 13:55:34 +0000 (13:55 +0000)]
We didn't change the MODULE_MAGIC_NUMBER_MAJOR

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

8 years agorebuild
Rich Bowen [Fri, 5 Aug 2016 13:49:59 +0000 (13:49 +0000)]
rebuild

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

8 years agomod_http2: support for intermediate responses
Stefan Eissing [Fri, 5 Aug 2016 13:48:16 +0000 (13:48 +0000)]
mod_http2: support for intermediate responses

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

8 years agoUpdate link to new location of Trawick's Exception Hook stuff.
Rich Bowen [Fri, 5 Aug 2016 13:47:45 +0000 (13:47 +0000)]
Update link to new location of Trawick's Exception Hook stuff.

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

8 years agoStop reflecting irrelevant data to the request error notes, particularly
William A. Rowe Jr [Fri, 5 Aug 2016 09:13:26 +0000 (09:13 +0000)]
Stop reflecting irrelevant data to the request error notes, particularly
for abusive and malformed traffic the non-technical consumer of a user-agent
has no control over.

Simply take note where the administrator-configured limits have been exceeded,
that administrator can find details in the error log if desired.

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

8 years agoTreat an empty obs-fold line as abusive traffic
William A. Rowe Jr [Fri, 5 Aug 2016 09:08:35 +0000 (09:08 +0000)]
Treat an empty obs-fold line as abusive traffic

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

8 years agoStrictly observe the one-SP requirement of every obs-fold line.
William A. Rowe Jr [Thu, 4 Aug 2016 21:43:01 +0000 (21:43 +0000)]
Strictly observe the one-SP requirement of every obs-fold line.

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

8 years agoNow eliminate all intra-obs-fold excess whitespace, results condensed per spec.
William A. Rowe Jr [Thu, 4 Aug 2016 20:51:49 +0000 (20:51 +0000)]
Now eliminate all intra-obs-fold excess whitespace, results condensed per spec.

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

8 years agoAn empty obs-fold line is a no-op.
William A. Rowe Jr [Thu, 4 Aug 2016 20:48:52 +0000 (20:48 +0000)]
An empty obs-fold line is a no-op.

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

8 years agoAs promised, reduce this logic by net 9 code lines, shifting the burden
William A. Rowe Jr [Thu, 4 Aug 2016 20:46:45 +0000 (20:46 +0000)]
As promised, reduce this logic by net 9 code lines, shifting the burden
of killing trailing whitespace to the purpose-agnostic read logic.

Whitespace before or after an obs-fold, and before or after a field value
have no semantic purpose at all. Because we are building a buffer for all
folded values, reducing the size of the newly allocated buffer is always
to our advantage.

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

8 years agoAnother comment for reviewers to follow
William A. Rowe Jr [Wed, 3 Aug 2016 23:17:07 +0000 (23:17 +0000)]
Another comment for reviewers to follow

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

8 years agoTesting len > 0 is redundant when *field is a "\0" and mismatches here,
William A. Rowe Jr [Wed, 3 Aug 2016 23:07:55 +0000 (23:07 +0000)]
Testing len > 0 is redundant when *field is a "\0" and mismatches here,
folded flag was a no-op, unused once we added continue; logic.
Fix these as initially attempted in r1755114.

Add some comments to make this code slightly more legible to the reviewer.

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

8 years agoReformat for indentation following r1755123, Whitespace Only
William A. Rowe Jr [Wed, 3 Aug 2016 22:58:10 +0000 (22:58 +0000)]
Reformat for indentation following r1755123, Whitespace Only

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

8 years agoClean up an edge case where obs-fold continuation preceeds the first header,
William A. Rowe Jr [Wed, 3 Aug 2016 22:42:26 +0000 (22:42 +0000)]
Clean up an edge case where obs-fold continuation preceeds the first header,
as with r1755098, but this time ensure the previous header processing logic
ensures there was a previous header as identified by jchampion.

This patch restructures the loop for legibility with a loop continuation,
allowing us to flatten all of this hard-to-follow code. The subsequent
patch will be a whitespace-only change for formatting.

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

8 years agoRevert to r1754577 based on last_field NULL on first-pass defect
William A. Rowe Jr [Wed, 3 Aug 2016 21:51:04 +0000 (21:51 +0000)]
Revert to r1754577 based on last_field NULL on first-pass defect
noted by Jacob Champion, discarding my work of today.

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

8 years agoC89 fix, caught by Jacob Champion
William A. Rowe Jr [Wed, 3 Aug 2016 21:40:12 +0000 (21:40 +0000)]
C89 fix, caught by Jacob Champion

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

8 years agoImprove comments for reviewers to understand this logic
William A. Rowe Jr [Wed, 3 Aug 2016 21:38:12 +0000 (21:38 +0000)]
Improve comments for reviewers to understand this logic

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

8 years agoTesting len > 0 is redundant when *field is a "\0" and mismatches here.
William A. Rowe Jr [Wed, 3 Aug 2016 21:18:12 +0000 (21:18 +0000)]
Testing len > 0 is redundant when *field is a "\0" and mismatches here.

folded flag was a no-op, unused once we added continue; logic.

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

8 years agoWhitespace-only followup after r1755098 logic patch
William A. Rowe Jr [Wed, 3 Aug 2016 16:59:21 +0000 (16:59 +0000)]
Whitespace-only followup after r1755098 logic patch

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

8 years agoClean up an edge case where obs-fold continuation preceeds the first header.
William A. Rowe Jr [Wed, 3 Aug 2016 16:46:20 +0000 (16:46 +0000)]
Clean up an edge case where obs-fold continuation preceeds the first header.

This patch restructures the loop for legibility with a loop continuation,
allowing us to flatten all of this hard-to-follow code. The subsequent
patch will be a whitespace-only change for formatting.

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

8 years agoRevert r1754732,r1754734,r1754736 after a conversation on dev@ and IRC.
Luca Toscano [Tue, 2 Aug 2016 17:22:44 +0000 (17:22 +0000)]
Revert r1754732,r1754734,r1754736 after a conversation on dev@ and IRC.
We agreed to consider r1752347 as bug fix and delay performance improvements
for later revisions.

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

8 years agomod_proxy_http: 204 or 304 cannot happen here since ap_is_HTTP_ERROR() above
Yann Ylavic [Tue, 2 Aug 2016 16:42:39 +0000 (16:42 +0000)]
mod_proxy_http: 204 or 304 cannot happen here since ap_is_HTTP_ERROR() above
is true.

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

8 years agomod_proxy_http: handle 401 error override in the same block as other errors
Yann Ylavic [Tue, 2 Aug 2016 16:34:56 +0000 (16:34 +0000)]
mod_proxy_http: handle 401 error override in the same block as other errors
to simplify logic, no functional change.

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

8 years agomod_proxy_http: don't pretend we are sending a body before ProxyErrorOverride
Yann Ylavic [Tue, 2 Aug 2016 16:27:26 +0000 (16:27 +0000)]
mod_proxy_http: don't pretend we are sending a body before ProxyErrorOverride
takes place, the response it to be handled by ErrorDocument is this case.
Also it useless to take care of pre-read data since the body is discarded in
this case.

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

8 years agoCorrect use of <module> tag to fix broken links.
Rich Bowen [Mon, 1 Aug 2016 16:34:14 +0000 (16:34 +0000)]
Correct use of <module> tag to fix broken links.

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

8 years agoPoint to correct metafile for this howto doc.
Rich Bowen [Mon, 1 Aug 2016 16:29:17 +0000 (16:29 +0000)]
Point to correct metafile for this howto doc.

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

8 years agoChanged the code comments to be more clear a fixed a typo (will be more careful next...
Luca Toscano [Mon, 1 Aug 2016 11:24:44 +0000 (11:24 +0000)]
Changed the code comments to be more clear a fixed a typo (will be more careful next time, didn't spot the problem until already committed)

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

8 years agoFixed a typo introduced by my previous commit, really sorry about it
Luca Toscano [Mon, 1 Aug 2016 11:01:04 +0000 (11:01 +0000)]
Fixed a typo introduced by my previous commit, really sorry about it

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

8 years agoSkip message-body with HTTP 304 responses and mod_proxy_fcgi with no conn reuse.
Luca Toscano [Mon, 1 Aug 2016 10:55:03 +0000 (10:55 +0000)]
Skip message-body with HTTP 304 responses and mod_proxy_fcgi with no conn reuse.

Background: https://bz.apache.org/bugzilla/show_bug.cgi?id=59838

This commit should be an improvement for http://svn.apache.org/r1752347, in which
I tried to resolve a long standing issue with mod_proxy_fcgi: when a FCGI backend
returns a response that will become a HTTP 304, mod_proxy_fcgi forces a break
in the request processing ending up in reading the remaining bytes (for example
the message-body) and trying to intepret them as a FCGI header. This would cause
a error and a weird behavior:
1) HTTP 304 response flushed to the client correctly.
2) HTTP 503 logged in the access_log plus other bogus errors in the error_log.
I tried to separate the behavior when connection reuse is set or not, to eliminate
unnecessary latency in the latter case (which is the default).

I tested the change with and without connection reuse successfully, but feedback is
really welcome. If nobody will have anything against it I'll then proceed to update
my 2.4.x backport proposal.

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

8 years agoCommiting to repor to not get later errors and continue the work elsewhere.
Luis Gil [Sun, 31 Jul 2016 19:23:58 +0000 (19:23 +0000)]
Commiting to repor to not get later errors and continue the work elsewhere.

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

8 years agoReplacement solution to identify VCHAR/ASCII symbols, even in EBCDIC.
William A. Rowe Jr [Fri, 29 Jul 2016 22:00:52 +0000 (22:00 +0000)]
Replacement solution to identify VCHAR/ASCII symbols, even in EBCDIC.

Looking for someone with an EBCDIC environment to post the output of
the test_char.h generated file for verification.

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

8 years agoCorrect logic, detect no 'token' chars, or missing ':'
William A. Rowe Jr [Fri, 29 Jul 2016 21:47:19 +0000 (21:47 +0000)]
Correct logic, detect no 'token' chars, or missing ':'

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

8 years agoCorrect usage for ap_scan_http_token (had used _get_ syntax), noted by Rüdiger
William A. Rowe Jr [Fri, 29 Jul 2016 20:22:37 +0000 (20:22 +0000)]
Correct usage for ap_scan_http_token (had used _get_ syntax), noted by Rüdiger

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

8 years agoClean up doubled-'{'
William A. Rowe Jr [Fri, 29 Jul 2016 20:12:38 +0000 (20:12 +0000)]
Clean up doubled-'{'

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

8 years agoFriendly catch by Rüdiger, restore line mis-removed by the previous commit
William A. Rowe Jr [Fri, 29 Jul 2016 20:08:56 +0000 (20:08 +0000)]
Friendly catch by Rüdiger, restore line mis-removed by the previous commit

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

8 years agoIntroduce ap_scan_http_token / ap_scan_http_field_content for a much
William A. Rowe Jr [Fri, 29 Jul 2016 17:37:41 +0000 (17:37 +0000)]
Introduce ap_scan_http_token / ap_scan_http_field_content for a much
more efficient pass through the header text; rather than reparsing
the strings over and over under the HTTP_CONFORMANCE_STRICT fules.

Improve logic and legibility by eliminating multiple repetitive tests
of the STRICT flag, and simply reorder 'classic' behavior first and
this new parser second to simplify the diff. Because of the whitespace
change (which I had wished to dodge), reading this --ignore-all-space
is a whole lot easier. Particularly against 2.4.x branch, which is now
identical in the 'classic' logic flow. Both of which I'll share with dev@

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

8 years agoLeave an emphatic TODO per Jeff's observations
William A. Rowe Jr [Fri, 29 Jul 2016 17:36:34 +0000 (17:36 +0000)]
Leave an emphatic TODO per Jeff's observations

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

8 years agoStrictly observe spec on obs-fold
William A. Rowe Jr [Fri, 29 Jul 2016 16:24:14 +0000 (16:24 +0000)]
Strictly observe spec on obs-fold

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

8 years agoWe arrive here for more than one cause; offer a more general statement
William A. Rowe Jr [Fri, 29 Jul 2016 16:20:40 +0000 (16:20 +0000)]
We arrive here for more than one cause; offer a more general statement

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

8 years agoWith NUL as a TOKEN_STOP, this code is more efficient
William A. Rowe Jr [Fri, 29 Jul 2016 16:06:23 +0000 (16:06 +0000)]
With NUL as a TOKEN_STOP, this code is more efficient

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

8 years agoIntroduce ap_scan_http_field_content, ap_scan_http_token
William A. Rowe Jr [Fri, 29 Jul 2016 15:56:54 +0000 (15:56 +0000)]
Introduce ap_scan_http_field_content, ap_scan_http_token
and ap_get_http_token for more efficient string handling.

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

8 years agoIntroduce T_HTTP_CTRLS for efficiently finding non-text chars
William A. Rowe Jr [Fri, 29 Jul 2016 15:49:02 +0000 (15:49 +0000)]
Introduce T_HTTP_CTRLS for efficiently finding non-text chars

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

8 years agoBe more explicit about NUL in case iscntrl is inconsistent
William A. Rowe Jr [Fri, 29 Jul 2016 15:40:15 +0000 (15:40 +0000)]
Be more explicit about NUL in case iscntrl is inconsistent

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

8 years agoCorrect T_HTTP_TOKEN_STOP per RFC2068 (2.2) - RFC7230 (3.2.6),
William A. Rowe Jr [Fri, 29 Jul 2016 15:35:56 +0000 (15:35 +0000)]
Correct T_HTTP_TOKEN_STOP per RFC2068 (2.2) - RFC7230 (3.2.6),
which has always defined 'token' as CHAR or VCHAR - visible USASCII only.

NUL char is also a stop, end of parsing.

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

8 years agoImprove legibility of reviewing the generated table, using hex rather than dec
William A. Rowe Jr [Fri, 29 Jul 2016 15:24:39 +0000 (15:24 +0000)]
Improve legibility of reviewing the generated table, using hex rather than dec

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

8 years agomod_http2: complete implemenmtation of draft-http2-debug-state
Stefan Eissing [Fri, 29 Jul 2016 15:12:38 +0000 (15:12 +0000)]
mod_http2: complete implemenmtation of draft-http2-debug-state

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

8 years agomod_http2: work on .well-known/h2Interop/state
Stefan Eissing [Thu, 28 Jul 2016 14:02:10 +0000 (14:02 +0000)]
mod_http2: work on .well-known/h2Interop/state

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

8 years agomod_reqtimeout: follow up to r1754391: fix missing "else".
Yann Ylavic [Thu, 28 Jul 2016 11:24:57 +0000 (11:24 +0000)]
mod_reqtimeout: follow up to r1754391: fix missing "else".

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

8 years agomod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
Yann Ylavic [Thu, 28 Jul 2016 10:57:22 +0000 (10:57 +0000)]
mod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
triggering mod_proxy_connect's AH01018 once the tunnel is established.
https://bugzilla.mozilla.org/show_bug.cgi?id=1279483#c9

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

8 years agoupdate transformation
André Malo [Thu, 28 Jul 2016 09:17:18 +0000 (09:17 +0000)]
update transformation

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

8 years agoset eol-style
André Malo [Thu, 28 Jul 2016 09:12:48 +0000 (09:12 +0000)]
set eol-style

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

8 years agofix encoding in commit mails for spanish translations
André Malo [Thu, 28 Jul 2016 09:09:05 +0000 (09:09 +0000)]
fix encoding in commit mails for spanish translations

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

8 years agoCommiting to repor to not get later errors and continue the work elsewhere.
Luis Gil [Thu, 28 Jul 2016 07:47:57 +0000 (07:47 +0000)]
Commiting to repor to not get later errors and continue the work elsewhere.

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

8 years agotook out the html codes of the accents.
Luis Gil [Tue, 26 Jul 2016 21:36:07 +0000 (21:36 +0000)]
took out the html codes of the accents.

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

8 years agomod_proxy_wstunnel: we want to detect whether some response was sent to
Yann Ylavic [Tue, 26 Jul 2016 17:50:34 +0000 (17:50 +0000)]
mod_proxy_wstunnel: we want to detect whether some response was sent to
the client when forwarding data from the backend to the client, not the
reverse.

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

8 years agomod_proxy_connect,wstunnel: log polling errors (and events) consistently at
Yann Ylavic [Tue, 26 Jul 2016 17:37:18 +0000 (17:37 +0000)]
mod_proxy_connect,wstunnel: log polling errors (and events) consistently at
level ERR (resp. TRACE2), and name the backend connection "backend" instead of
"sock".

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

8 years agomod_proxy_http: ping retry only if full 100-continue conditions are met.
Yann Ylavic [Tue, 26 Jul 2016 17:16:18 +0000 (17:16 +0000)]
mod_proxy_http: ping retry only if full 100-continue conditions are met.

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

8 years agomod_http2: update after backport
Stefan Eissing [Tue, 26 Jul 2016 13:51:15 +0000 (13:51 +0000)]
mod_http2: update after backport

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

8 years agoRebuild.
Lucien Gentis [Sat, 23 Jul 2016 15:22:08 +0000 (15:22 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 23 Jul 2016 15:20:09 +0000 (15:20 +0000)]
XML update.

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

8 years agoSince this is beginner doc, split the -S invocation into two
Eric Covener [Sat, 23 Jul 2016 14:11:17 +0000 (14:11 +0000)]
Since this is beginner doc, split the -S invocation into two
versions more likely to work verbatim.

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

8 years agoPermit mod_proxy_hcheck.c to compile on Win32 32-bit architectures.
William A. Rowe Jr [Fri, 22 Jul 2016 12:28:54 +0000 (12:28 +0000)]
Permit mod_proxy_hcheck.c to compile on Win32 32-bit architectures.
This decoration is required for all apr_thread fn() entry points,
at least on some platforms.

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

8 years agoadd basic h2: and h2c: backend proxy examples
Eric Covener [Thu, 21 Jul 2016 16:43:21 +0000 (16:43 +0000)]
add basic h2: and h2c: backend proxy examples

Submitted by: Hank Ibell <hwibell gmail.com>
Committed by: covener

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

8 years ago* Prevent redirect loops between workers within a balancer by limiting the
Ruediger Pluem [Wed, 20 Jul 2016 18:32:14 +0000 (18:32 +0000)]
* Prevent redirect loops between workers within a balancer by limiting the
  number of redirects to the number balancer members.

PR: 59864

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

8 years ago* Fix typo
Ruediger Pluem [Wed, 20 Jul 2016 18:28:09 +0000 (18:28 +0000)]
* Fix typo

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

8 years ago* Do not overwrite r->status with access_status if access_status is OK or DONE
Ruediger Pluem [Wed, 20 Jul 2016 18:25:01 +0000 (18:25 +0000)]
* Do not overwrite r->status with access_status if access_status is OK or DONE
  as in this case r->status might contain the true response code.

PR: 59869

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

8 years ago* Whitespace police
Ruediger Pluem [Wed, 20 Jul 2016 18:19:15 +0000 (18:19 +0000)]
* Whitespace police

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

8 years agomod_http2: fixing config lookup now that we have dir conf
Stefan Eissing [Wed, 20 Jul 2016 15:57:51 +0000 (15:57 +0000)]
mod_http2: fixing config lookup now that we have dir conf

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

8 years agohtml update after new http2 directive
Stefan Eissing [Wed, 20 Jul 2016 13:07:15 +0000 (13:07 +0000)]
html update after new http2 directive

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

8 years agomod_http2: new H2CopyFiles directive
Stefan Eissing [Wed, 20 Jul 2016 13:04:57 +0000 (13:04 +0000)]
mod_http2: new H2CopyFiles directive

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

8 years agoconfigure: remove orphaned APACHE_OUTPUT macro
Jacob Champion [Mon, 18 Jul 2016 20:43:09 +0000 (20:43 +0000)]
configure: remove orphaned APACHE_OUTPUT macro

The last use of APACHE_OUTPUT appears to have been removed back in
r87231.

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

8 years agoconfigure: move away from obsolete AC_OUTPUT args
Jacob Champion [Mon, 18 Jul 2016 20:43:08 +0000 (20:43 +0000)]
configure: move away from obsolete AC_OUTPUT args

AC_OUTPUT's use with arguments was obsoleted back at or before autoconf
2.50. Replace it with the preferred AC_CONFIG_FILES/AC_CONFIG_COMMANDS
calls.

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

8 years agoA whole lotta nope, if you implement HTCPCP then register your methods in init
William A. Rowe Jr [Mon, 18 Jul 2016 16:20:27 +0000 (16:20 +0000)]
A whole lotta nope, if you implement HTCPCP then register your methods in init

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

8 years agoRestore 'HEAD' method as a special case of GET with the common ID
William A. Rowe Jr [Mon, 18 Jul 2016 16:01:21 +0000 (16:01 +0000)]
Restore 'HEAD' method as a special case of GET with the common ID

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

8 years agoThe method_registry is initialized in register_hooks() for mod_http
William A. Rowe Jr [Mon, 18 Jul 2016 15:31:39 +0000 (15:31 +0000)]
The method_registry is initialized in register_hooks() for mod_http

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

8 years agoOptimization to httpoxy workaround, for 2.4.23+ only.
William A. Rowe Jr [Mon, 18 Jul 2016 14:09:38 +0000 (14:09 +0000)]
Optimization to httpoxy workaround, for 2.4.23+ only.

Submitted by: ylavic

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

8 years agohttpoxy workarounds, first draft patch as published for all 2.2.x+ sources
William A. Rowe Jr [Mon, 18 Jul 2016 14:07:00 +0000 (14:07 +0000)]
httpoxy workarounds, first draft patch as published for all 2.2.x+ sources

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

8 years agoUnclear whether fdpass is common enough to justify a 'most' configuration,
William A. Rowe Jr [Mon, 18 Jul 2016 13:43:08 +0000 (13:43 +0000)]
Unclear whether fdpass is common enough to justify a 'most' configuration,
but for the time being, assign it -something- for a build priority.

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

8 years agoSimplify; this code is executed one per request processed, saving
William A. Rowe Jr [Mon, 18 Jul 2016 13:41:26 +0000 (13:41 +0000)]
Simplify; this code is executed one per request processed, saving
an immeasurably small quantum of CPU of a server under load.

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

8 years agomod_proxy_fcgi: avoid loops serving proxied error documents
Luca Toscano [Mon, 18 Jul 2016 08:02:23 +0000 (08:02 +0000)]
mod_proxy_fcgi: avoid loops serving proxied error documents

This commit should solve the issue indicated in PR 55415.
Httpd loops while serving a error document if:
1) The error document's content is proxied.
2) ProxyErrorOverride is set.
The solution proposed is to limit the use of ap_die only
to the initial request. I tested the change with very basic
scenarios but I am not sure if I got all the use cases,
feedback is really welcome.

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

8 years agoRebuild.
Lucien Gentis [Sat, 16 Jul 2016 16:01:47 +0000 (16:01 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 16 Jul 2016 16:00:49 +0000 (16:00 +0000)]
XML update.

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

8 years agoadd comments for all media types in IANA registry dated 2016-07-14
Roy T. Fielding [Sat, 16 Jul 2016 00:00:43 +0000 (00:00 +0000)]
add comments for all media types in IANA registry dated 2016-07-14

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

8 years agoDoc rebuild
Luca Toscano [Fri, 15 Jul 2016 11:59:42 +0000 (11:59 +0000)]
Doc rebuild

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

8 years agoAdded a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads...
Luca Toscano [Fri, 15 Jul 2016 11:59:10 +0000 (11:59 +0000)]
Added a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads lower bounds calculation in the docs.

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

8 years agoxforms
Christophe Jaillet [Thu, 14 Jul 2016 21:02:38 +0000 (21:02 +0000)]
xforms

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

8 years agoFix PR 59856.
Christophe Jaillet [Thu, 14 Jul 2016 21:01:28 +0000 (21:01 +0000)]
Fix PR 59856.
Fix directive name. (ProxyRequest vs ProxyRequests)
Improve highlight.

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

8 years agoPR59844: stack-allocated ap_expr_info_t returned from mod_include
Eric Covener [Wed, 13 Jul 2016 12:40:25 +0000 (12:40 +0000)]
PR59844: stack-allocated ap_expr_info_t returned from mod_include

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

8 years agoFix typo in CHANGES
Luca Toscano [Wed, 13 Jul 2016 11:36:05 +0000 (11:36 +0000)]
Fix typo in CHANGES

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

8 years agoEnsure the default mode and cipher is set correctly. Remove useless setting
Graham Leggett [Tue, 12 Jul 2016 21:15:59 +0000 (21:15 +0000)]
Ensure the default mode and cipher is set correctly. Remove useless setting
of the size_set flag.

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

8 years agoForce mod_proxy_fcgi to read the whole FCGI response
Luca Toscano [Tue, 12 Jul 2016 21:13:37 +0000 (21:13 +0000)]
Force mod_proxy_fcgi to read the whole FCGI response
even when the content has not been modified (HTTP 304).

The problem is described in PR 59838. This patch should
avoid bogus reads causing the following issues with
HTTP 304 responses:
- AH01068: Got bogus version X, expected 1
- AH01069: Got bogus rid X, expected 1
- AH01075: Error dispatching request to :
- HTTP 503 logged instead of 304 (even if the external
  client gets correctly a 304)

As discussed on IRC the HTTP_PRECONDITION_FAILED use case
should be handled like the HTTP_NOT_MODIFIED one but it will
be done in a separate commit.

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

8 years agoCMake: quote installation paths
Jacob Champion [Tue, 12 Jul 2016 19:13:38 +0000 (19:13 +0000)]
CMake: quote installation paths

Deal with installation paths with spaces in them (e.g. "C:\Program
Files") by quoting the arguments to perl and xcopy.

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

8 years agoCMake: use generator expressions to find output files
Jacob Champion [Tue, 12 Jul 2016 19:13:36 +0000 (19:13 +0000)]
CMake: use generator expressions to find output files

Multi-configuration generators, like Visual Studio, use a different
output directory (Debug, Release, etc.) for each configuration. To find
the output files reliably, switch to using generator expressions instead
of hardcoding the file paths for PDBs, export files, etc.

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

8 years agoCMake: use CMAKE_REQUIRED_INCLUDES to find APR macros
Jacob Champion [Tue, 12 Jul 2016 19:13:34 +0000 (19:13 +0000)]
CMake: use CMAKE_REQUIRED_INCLUDES to find APR macros

When using CMake with Visual Studio on Windows, invoking the
CHECK_SYMBOL_EXISTS macro with the full paths to the include files seems
to always result in failure.

Instead, use the documented CMAKE_REQUIRED_INCLUDES variable to set the
include directory, and pass only the headers' base names to
CHECK_SYMBOL_EXISTS.

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

8 years agomod_http2: no master timeout while requests are ongoing
Stefan Eissing [Mon, 11 Jul 2016 11:03:24 +0000 (11:03 +0000)]
mod_http2: no master timeout while requests are ongoing

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

8 years agoupdate transformation
André Malo [Sun, 10 Jul 2016 20:00:17 +0000 (20:00 +0000)]
update transformation

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

8 years agofix properties
André Malo [Sun, 10 Jul 2016 19:56:36 +0000 (19:56 +0000)]
fix properties

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

8 years agomod_crypto: Add the all purpose crypto filters with support for HLS.
Graham Leggett [Sun, 10 Jul 2016 17:27:03 +0000 (17:27 +0000)]
mod_crypto: Add the all purpose crypto filters with support for HLS.

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

8 years agoupdate after backport
Stefan Eissing [Sun, 10 Jul 2016 14:50:38 +0000 (14:50 +0000)]
update after backport

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

8 years agomod_http2: fixing flush on SETTINGS frames without open streams
Stefan Eissing [Sun, 10 Jul 2016 13:02:17 +0000 (13:02 +0000)]
mod_http2: fixing flush on SETTINGS frames without open streams

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