]> granicus.if.org Git - apache/log
apache
7 years agoDocs regen
William A. Rowe Jr [Thu, 18 Aug 2016 07:15:24 +0000 (07:15 +0000)]
Docs regen

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

7 years agoPerform correct, strict parsing of the request line, handling the
William A. Rowe Jr [Thu, 18 Aug 2016 07:15:06 +0000 (07:15 +0000)]
Perform correct, strict parsing of the request line, handling the
http protocol tag, url and method appropriately, and attempting
to extract values even in the presence of unusual whitespace in
keeping with section 3.5, prior to responding with whatever
error reply is needed. Conforms to RFC7230 in all respects,
the section 3.5 optional behavior can be disabled by the user
with a new HttpProtocolOptions StrictWhitespace flag. In all
cases, the_request is regenerated from the parsed components
with exactly two space characters.

Shift sf's 'strict' method check from the Strict behavior because
it violates forward proxy logic, adding a new RegisteredMethods
flag, as it will certainly be useful to some.

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

7 years agoGrab a pool of aplogno's
William A. Rowe Jr [Thu, 18 Aug 2016 07:02:39 +0000 (07:02 +0000)]
Grab a pool of aplogno's

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

7 years agoxforms
Christophe Jaillet [Thu, 18 Aug 2016 04:49:22 +0000 (04:49 +0000)]
xforms

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

7 years agoImprove highlight and formatting.
Christophe Jaillet [Thu, 18 Aug 2016 04:48:02 +0000 (04:48 +0000)]
Improve highlight and formatting.

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

7 years agoRenaming this directive to HttpProtocolOptions after discussion on dev@
William A. Rowe Jr [Wed, 17 Aug 2016 16:24:23 +0000 (16:24 +0000)]
Renaming this directive to HttpProtocolOptions after discussion on dev@

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

7 years agomod_cache: follow up to r1756553: log the real/actual cached URI (debug).
Yann Ylavic [Wed, 17 Aug 2016 13:22:20 +0000 (13:22 +0000)]
mod_cache: follow up to r1756553: log the real/actual cached URI (debug).

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

7 years agomod_dav: follow up to r1746207: fix typo (missing '/') for closing tag.
Yann Ylavic [Wed, 17 Aug 2016 11:06:43 +0000 (11:06 +0000)]
mod_dav: follow up to r1746207:  fix typo (missing '/') for closing tag.

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

7 years agorebuild
Rich Bowen [Tue, 16 Aug 2016 23:43:46 +0000 (23:43 +0000)]
rebuild

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

7 years agoGrammar tweaks, as per BZ59999
Rich Bowen [Tue, 16 Aug 2016 23:41:54 +0000 (23:41 +0000)]
Grammar tweaks, as per BZ59999

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

7 years agoCorrect AP_HTTP_CONFORMANCE_ flags with an ap_mmn.h bump
William A. Rowe Jr [Tue, 16 Aug 2016 22:29:39 +0000 (22:29 +0000)]
Correct AP_HTTP_CONFORMANCE_ flags with an ap_mmn.h bump

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

7 years agomod_cache: Use the actual URI path and query-string for identifying the
Yann Ylavic [Tue, 16 Aug 2016 21:48:09 +0000 (21:48 +0000)]
mod_cache: Use the actual URI path and query-string for identifying the
cached entity (key), such that rewrites are taken into account when
running afterwards (CacheQuickHandler off).  PR 21935.

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

7 years agomod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
Yann Ylavic [Tue, 16 Aug 2016 18:24:56 +0000 (18:24 +0000)]
mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
in the client certificate chain.  PR 55786.

This is done by handling an empty cert chain as no/NULL chain.

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

7 years agoRegen docs
William A. Rowe Jr [Tue, 16 Aug 2016 18:11:47 +0000 (18:11 +0000)]
Regen docs

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

7 years agoRename the previously undocumented HTTPProtocol directive
William A. Rowe Jr [Tue, 16 Aug 2016 18:11:14 +0000 (18:11 +0000)]
Rename the previously undocumented HTTPProtocol directive
to EnforceHTTPProtocol, and invert the default behavior
to strictly observe RFC 7230 unless otherwise configured.
And Document This.

The relaxation option is renamed 'Unsafe'. 'Strict' is no
longer case sensitive. 'min=0.9|1.0' is now the verbose
'Allow0.9' or 'Require1.0' case-insenstive grammer. The
exclusivity tests have been modified to detect conflicts.

The 'strict,log' option failed to enforce strict conformance,
and has been removed. Unsafe, informational logging is possible
in any loadable module, after the request data is unsafely
accepted.

This triggers a group of failures in t/apache/headers.t as
expected since those patterns violated RFC 7230 section 3.2.4.

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

7 years agoFollow up to r1750392: reduce AH03408 level to INFO as suggested by wrowe/jim.
Yann Ylavic [Tue, 16 Aug 2016 16:21:13 +0000 (16:21 +0000)]
Follow up to r1750392: reduce AH03408 level to INFO as suggested by wrowe/jim.

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

7 years agoFollow up to r1750392: r1756186 should have also bumped MMN minor for
Yann Ylavic [Sun, 14 Aug 2016 20:42:16 +0000 (20:42 +0000)]
Follow up to r1750392: r1756186 should have also bumped MMN minor for
s/ap_proxy_check_backend/ap_proxy_check_connection/, and r1756328 really bump the MMN :p

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

7 years agoFollow up to r1750392: r1756186 should have also bumped MMN minor for
Yann Ylavic [Sun, 14 Aug 2016 20:40:38 +0000 (20:40 +0000)]
Follow up to r1750392: r1756186 should have also bumped MMN minor for
s/ap_proxy_check_backend/ap_proxy_check_connection/.

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

7 years agoRebuild.
Lucien Gentis [Sat, 13 Aug 2016 15:23:08 +0000 (15:23 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sat, 13 Aug 2016 15:22:09 +0000 (15:22 +0000)]
XML updates.

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

7 years agorebuild various recent changes
Rich Bowen [Fri, 12 Aug 2016 19:30:57 +0000 (19:30 +0000)]
rebuild various recent changes

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

7 years agomod_proxy_fcgi: forcing proxy_conn->close here is useless, same is done
Yann Ylavic [Fri, 12 Aug 2016 14:04:51 +0000 (14:04 +0000)]
mod_proxy_fcgi: forcing proxy_conn->close here is useless, same is done
either above in ap_proxy_determine_connection(), or below in
ap_proxy_release_connection().

[Reverted by r1757097]

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

7 years ago[mod_proxy_]http: follow up to r1750392.
Yann Ylavic [Fri, 12 Aug 2016 13:58:10 +0000 (13:58 +0000)]
[mod_proxy_]http: follow up to r1750392.

Export [ap_]check_pipeline() and use it also for ap_proxy_check_connection(),
so that all the necessary checks on the connection are done before reusing it.

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

7 years agoClarify some z/OS mysteries via code comments.
Rainer Jung [Fri, 12 Aug 2016 11:50:38 +0000 (11:50 +0000)]
Clarify some z/OS mysteries via code comments.
Followup to r1421305.
PR 56210

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

7 years agoCommiting to repor to not get later errors and continue the work elsewhere.
Luis Gil [Fri, 12 Aug 2016 11:21:58 +0000 (11:21 +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@1756150 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRevert r1756064 and r1756060 until fixed (tests framework passes).
Yann Ylavic [Thu, 11 Aug 2016 23:37:45 +0000 (23:37 +0000)]
Revert r1756064 and r1756060 until fixed (tests framework passes).

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

7 years agohttp: follow up to r1750392.
Yann Ylavic [Thu, 11 Aug 2016 23:24:47 +0000 (23:24 +0000)]
http: follow up to r1750392.
Restore AP_MODE_READBYTES cleared inadvertently in r1756060.

[Reverted by r1756065]

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

7 years ago[mod_proxy_]http: follow up to r1750392.
Yann Ylavic [Thu, 11 Aug 2016 22:32:42 +0000 (22:32 +0000)]
[mod_proxy_]http: follow up to r1750392.
Export [ap_]check_pipeline() and use it also for ap_proxy_check_connection().

[Reverted by r1756065]

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

7 years agoFix spelling in comments and text files.
Rainer Jung [Thu, 11 Aug 2016 19:50:02 +0000 (19:50 +0000)]
Fix spelling in comments and text files.
No functional change.
PR 59990

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

7 years agogrammar++
Rich Bowen [Thu, 11 Aug 2016 13:37:37 +0000 (13:37 +0000)]
grammar++

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

7 years agorebuild. Remove weird copy/paste error.
Rich Bowen [Thu, 11 Aug 2016 13:35:59 +0000 (13:35 +0000)]
rebuild. Remove weird copy/paste error.

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

7 years agoindentation for better readability
Rich Bowen [Thu, 11 Aug 2016 13:34:22 +0000 (13:34 +0000)]
indentation for better readability

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

7 years agorebuild various things
Rich Bowen [Thu, 11 Aug 2016 13:00:20 +0000 (13:00 +0000)]
rebuild various things

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

7 years agoA little odd having that warning buried under the machine-readable
Rich Bowen [Thu, 11 Aug 2016 12:45:18 +0000 (12:45 +0000)]
A little odd having that warning buried under the machine-readable
section.

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

7 years agoRevert r1755930: actually what'd be read after AP_FCGI_END_REQUEST is padding,
Yann Ylavic [Thu, 11 Aug 2016 10:40:49 +0000 (10:40 +0000)]
Revert r1755930: actually what'd be read after AP_FCGI_END_REQUEST is padding,
not any potential/errorneous next response.

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

7 years agomod_{proxy,authnz}_fcgi: follow up to r1750392.
Yann Ylavic [Thu, 11 Aug 2016 10:32:35 +0000 (10:32 +0000)]
mod_{proxy,authnz}_fcgi: follow up to r1750392.
Don't try to read past AP_FCGI_END_REQUEST on the backend side, it would be
a response for the next request.

[Reverted by r1755931]

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

7 years agoSilence more "defined but not used" compiler
Rainer Jung [Wed, 10 Aug 2016 21:57:14 +0000 (21:57 +0000)]
Silence more "defined but not used" compiler
warnings when building against OpenSSL 0.9.8a.

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

7 years agoSilence "defined but not used" compiler warnings
Rainer Jung [Wed, 10 Aug 2016 21:34:21 +0000 (21:34 +0000)]
Silence "defined but not used" compiler warnings
when building against OpenSSL 0.9.8a.

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

7 years agoOpenSSL 1.1.0 compat:
Rainer Jung [Wed, 10 Aug 2016 20:58:22 +0000 (20:58 +0000)]
OpenSSL 1.1.0 compat:
- move IDCONST macro outside of addition #if check.
  Otherwise we break compatibility with old
  OpenSSL 0.9.8 releases.

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

7 years agoFollow on to r1755264, for the case of merged header length exceptions,
William A. Rowe Jr [Wed, 10 Aug 2016 13:39:35 +0000 (13:39 +0000)]
Follow on to r1755264, for the case of merged header length exceptions,
and ensure the field header name is truncated to a sane log width.

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

7 years agoRemove calling ERR_remove_thread_state when
Rainer Jung [Wed, 10 Aug 2016 11:20:00 +0000 (11:20 +0000)]
Remove calling ERR_remove_thread_state when
using OpenSSL 1.1.0.

This API is now a no-op in OpenSSL 1.1.0 and
deprecated.

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

7 years agoCompatibility with OpenSSL 1.1.0 pre6.
Rainer Jung [Tue, 9 Aug 2016 23:09:46 +0000 (23:09 +0000)]
Compatibility with OpenSSL 1.1.0 pre6.

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

7 years agoClarify phrasing, as per bz53152
Rich Bowen [Fri, 5 Aug 2016 16:19:01 +0000 (16:19 +0000)]
Clarify phrasing, as per bz53152

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

7 years agoVarious typos, broken links, and obsolete modules.
Rich Bowen [Fri, 5 Aug 2016 15:43:49 +0000 (15:43 +0000)]
Various typos, broken links, and obsolete modules.

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

7 years agofix link to mod_headers
Rich Bowen [Fri, 5 Aug 2016 15:20:30 +0000 (15:20 +0000)]
fix link to mod_headers

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

7 years agorebuild
Rich Bowen [Fri, 5 Aug 2016 15:19:04 +0000 (15:19 +0000)]
rebuild

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

7 years agoremove references to MPMs that no longer exist
Rich Bowen [Fri, 5 Aug 2016 15:16:33 +0000 (15:16 +0000)]
remove references to MPMs that no longer exist

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

7 years agoFollow up to r1755264.
Yann Ylavic [Fri, 5 Aug 2016 15:08:24 +0000 (15:08 +0000)]
Follow up to r1755264.
Don't crash when ap_rgetline() returns a NULL field on ENOSPC.

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

7 years agorebuild fixed links
Rich Bowen [Fri, 5 Aug 2016 14:53:45 +0000 (14:53 +0000)]
rebuild fixed links

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

7 years agoCorrect name of authnz_ldap module in French translation.
Rich Bowen [Fri, 5 Aug 2016 14:53:11 +0000 (14:53 +0000)]
Correct name of authnz_ldap module in French translation.

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

7 years agoRemove reference to long-gone FAQ.
Rich Bowen [Fri, 5 Aug 2016 14:48:30 +0000 (14:48 +0000)]
Remove reference to long-gone FAQ.

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

7 years agorebuild
Rich Bowen [Fri, 5 Aug 2016 14:47:33 +0000 (14:47 +0000)]
rebuild

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

7 years agoRemove reference to long-gone FAQ.
Rich Bowen [Fri, 5 Aug 2016 14:46:59 +0000 (14:46 +0000)]
Remove reference to long-gone FAQ.

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

7 years agofix link to mod_setenvif
Rich Bowen [Fri, 5 Aug 2016 14:44:31 +0000 (14:44 +0000)]
fix link to mod_setenvif

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

7 years agorebuild
Rich Bowen [Fri, 5 Aug 2016 14:34:02 +0000 (14:34 +0000)]
rebuild

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

7 years agofix broken links
Rich Bowen [Fri, 5 Aug 2016 14:33:17 +0000 (14:33 +0000)]
fix broken links

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

7 years agoUpdate
Jim Jagielski [Fri, 5 Aug 2016 13:56:07 +0000 (13:56 +0000)]
Update

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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