1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-11 02:42:23 +03:00
Commit Graph

5808 Commits

Author SHA1 Message Date
Lucien Gentis
c848d4ebe2 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1761219 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:13:34 +00:00
Lucien Gentis
c6fb3399f6 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1761218 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:12:28 +00:00
Eric Covener
c9ee0acba0 xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1761216 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:09:33 +00:00
Eric Covener
01956ad63a feedback in http://httpd.apache.org/docs/2.4/mod/mod_ssl.html#comment_5818
This added paragraph about optional and optional_no_ca isn't helpful.

At the TLS layer, the challenge for otpional and required are no different.

Move the caution about _no_ca up into where the option is defined
and reword.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1761215 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:09:25 +00:00
Rich Bowen
d49939c66d rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760977 13f79535-47bb-0310-9956-ffa450edef68
2016-09-15 20:22:47 +00:00
Rich Bowen
b3e4b09556 Reverting. I misunderstood.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760590 13f79535-47bb-0310-9956-ffa450edef68
2016-09-13 19:59:18 +00:00
Rich Bowen
912159aed8 This option, not this module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760589 13f79535-47bb-0310-9956-ffa450edef68
2016-09-13 19:57:08 +00:00
Luca Toscano
831dda7fd7 Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760279 13f79535-47bb-0310-9956-ffa450edef68
2016-09-11 20:49:14 +00:00
Luca Toscano
7b08b0d96c mod_proxy_html doc - Added a reference of ProxyHTMLLinks in the ProxyHTMLURLMap description and some examples.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760278 13f79535-47bb-0310-9956-ffa450edef68
2016-09-11 20:48:18 +00:00
Rich Bowen
d4ef91a59d Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760181 13f79535-47bb-0310-9956-ffa450edef68
2016-09-10 14:54:23 +00:00
Rich Bowen
2716cc7ec1 Add a section with an example of connecting to mysql. Because I can
never remember.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760180 13f79535-47bb-0310-9956-ffa450edef68
2016-09-10 14:53:04 +00:00
Lucien Gentis
d0b78cf205 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1759091 13f79535-47bb-0310-9956-ffa450edef68
2016-09-03 13:21:52 +00:00
Lucien Gentis
bab1184d24 XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1759089 13f79535-47bb-0310-9956-ffa450edef68
2016-09-03 13:20:57 +00:00
Jacob Champion
e0e0ceabfa docs: rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758311 13f79535-47bb-0310-9956-ffa450edef68
2016-08-30 00:01:55 +00:00
Jacob Champion
f533af4b28 mpm_winnt: remove 'data' AcceptFilter in favor of 'connect'
The 'data' AcceptFilter optimization instructs Windows to wait until
data is received on a connection before completing the AcceptEx
operation. Unfortunately, it seems this isn't performed atomically --
AcceptEx "partially" accepts the incoming connection during the wait for
data, leaving all other incoming connections in the accept queue. This
opens the server to a denial of service.

Since the fix for this requires a substantial rearchitecture (likely
involving multiple outstanding calls to AcceptEx), disable the 'data'
filter for now and replace it with 'connect', which uses the AcceptEx
interface but does not wait for data.

Users running prior releases of httpd on Windows should explicitly move
to a 'connect' AcceptFilter in their configurations if they are
currently using the default 'data' filter.

Many thanks to mludha, Arthur Ramsey, Paul Spangler, and many others for
their assistance in tracking down and diagnosing this issue.

PR: 59970

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758307 13f79535-47bb-0310-9956-ffa450edef68
2016-08-29 23:56:16 +00:00
William A. Rowe Jr
74a5f93a85 Regenerate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758267 13f79535-47bb-0310-9956-ffa450edef68
2016-08-29 17:33:04 +00:00
William A. Rowe Jr
a254df0a3c Clean up a stray <p>, copy n paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758266 13f79535-47bb-0310-9956-ffa450edef68
2016-08-29 17:32:41 +00:00
William A. Rowe Jr
9454686cde Clarify documentation based on concensus decisions discussed on dev@
and reflecting the current implementation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758265 13f79535-47bb-0310-9956-ffa450edef68
2016-08-29 17:30:53 +00:00
Lucien Gentis
04a554dc9f Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758115 13f79535-47bb-0310-9956-ffa450edef68
2016-08-28 13:59:31 +00:00
Lucien Gentis
be73b4aec6 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758114 13f79535-47bb-0310-9956-ffa450edef68
2016-08-28 13:57:59 +00:00
William A. Rowe Jr
38100ecd4f Resync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757923 13f79535-47bb-0310-9956-ffa450edef68
2016-08-26 21:05:35 +00:00
William A. Rowe Jr
7f78dd0fa0 First survey results, all intrinsicly bad input will be logged at the debug
level, no louder. This patch intentionally dodges the Limit* constrained tests
since administrators may shoot themselves in the foot, or be confronted with
impossibly long cookie values, etc.

Adjust the documentation to match.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757920 13f79535-47bb-0310-9956-ffa450edef68
2016-08-26 20:35:42 +00:00
Eric Covener
9b40242966 add [flags] to syntax
per http://httpd.apache.org/docs/2.4/mod/mod_rewrite.html#comment_5728

split list of flags out of the massive CondPattern list.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757838 13f79535-47bb-0310-9956-ffa450edef68
2016-08-26 12:59:20 +00:00
William A. Rowe Jr
76ff7ad7c6 Sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757712 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 15:41:01 +00:00
William A. Rowe Jr
1edea58c72 Correct RFC reference text (link was right)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757711 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 15:40:14 +00:00
Christophe Jaillet
6d06f54678 xforms fr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757599 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 04:54:49 +00:00
Christophe Jaillet
8888bfc270 Fix some French translations in order explanations to match examples.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757598 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 04:52:04 +00:00
William A. Rowe Jr
22a08f2aff Rebuild all
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757590 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 01:48:36 +00:00
William A. Rowe Jr
6cae6f2487 Rename LenientWhitespace to UnsafeWhitespace and change StrictWhitespace
to the default behavior, after discussion with fielding et al about the
purpose of section 3.5. Update the documentation to clarify this.

This patch removes whitespace considerations from the Strict|Unsafe toggle
and consolidates them all in the StrictWhitespace|UnsafeWhitespace toggle.

Added a bunch of logic comments to read_request_line parsing.

Dropped the badwhitespace list for an all-or-nothing toggle in rrl.

Leading space before the method is optimized to be evaluated only once.

Toggled the request from HTTP/0.9 to HTTP/1.0 for more BAD_REQUEST cases.

Moved s/[\n\v\f\r]/ / cleanup logic earlier in the cycle, to operate on
each individual line read, and catch bad whitespace errors earlier.
This changes the obs-fold to more efficiently condense whitespace and
forces concatinatination with a single SP, always. Overrides are not
necessary since obs-fold is clearly deprecated.






git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757589 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 01:46:20 +00:00
Eric Covener
bb179c503d xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757290 13f79535-47bb-0310-9956-ffa450edef68
2016-08-23 00:15:55 +00:00
Eric Covener
8d528f9af0 more PR60024 feedback re: consistent terminology.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757289 13f79535-47bb-0310-9956-ffa450edef68
2016-08-23 00:15:44 +00:00
Lucien Gentis
9eb9180e9c Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757050 13f79535-47bb-0310-9956-ffa450edef68
2016-08-21 11:43:53 +00:00
Lucien Gentis
df61fdc363 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757049 13f79535-47bb-0310-9956-ffa450edef68
2016-08-21 11:42:51 +00:00
Eric Covener
b6d53f4800 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757028 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 19:25:05 +00:00
Eric Covener
6386d1d407 more fixes for per-dir explanation
change style of per-dir note for readability



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757027 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 19:24:56 +00:00
Eric Covener
c892110050 doc is already a wall of text w/o regex hints.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757026 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 19:09:27 +00:00
Eric Covener
2824969b40 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757025 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 19:07:07 +00:00
Eric Covener
783b1eb4c0 bld break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757024 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 19:06:25 +00:00
Eric Covener
30e8530301 more per-dir cleanup, remove redundant text.
PR60024



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757023 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 19:04:40 +00:00
Eric Covener
42ef3c4669 take a pass through "per-dir" for PR60024
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757020 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 18:39:33 +00:00
Eric Covener
888138cabf roll back last two commits per PR60024.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757019 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 18:28:27 +00:00
Christophe Jaillet
dddb990d81 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756992 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 13:09:49 +00:00
Christophe Jaillet
ed06011da3 Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756991 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 13:09:12 +00:00
William A. Rowe Jr
7f477e487b Regen docs, no complaints yet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756979 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 01:17:51 +00:00
William A. Rowe Jr
b9a6a0ee7b Introduce StrictURI|UnsafeURI for RFC3986 enforcement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756959 13f79535-47bb-0310-9956-ffa450edef68
2016-08-19 19:48:58 +00:00
William A. Rowe Jr
953beadd81 Resync docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756863 13f79535-47bb-0310-9956-ffa450edef68
2016-08-19 02:33:43 +00:00
William A. Rowe Jr
31889a1c92 Fix as suggested by jailletc36, corresponding to all other comments on the topic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756862 13f79535-47bb-0310-9956-ffa450edef68
2016-08-19 02:32:25 +00:00
William A. Rowe Jr
194e79fd41 Docs regen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756730 13f79535-47bb-0310-9956-ffa450edef68
2016-08-18 07:15:24 +00:00
William A. Rowe Jr
8d77efe21e 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
2016-08-18 07:15:06 +00:00
Christophe Jaillet
9c1288c696 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756707 13f79535-47bb-0310-9956-ffa450edef68
2016-08-18 04:49:22 +00:00