1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

29077 Commits

Author SHA1 Message Date
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
Eric Covener
99d569e788 Stash the cgi PID earlier in mod_cgid
In some cases, a 2nd CGI using the same c->id can get into
the mod_cgid handler before cleanups have been run, causing
the new CGI pid to be used by the first CGI's cleanup function.

Instead of stashing c->id in the request processing thread,
just use it before leaving the handler to get the pid.

May indirectly fix PR57771, but it must have a slightly different
cause because stashing the conn_id slightly differently was 
supposed to be sufficient there.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758083 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 23:15:11 +00:00
Luca Toscano
9f7958a2c1 Updated the changelog to reflect last commits about Last-Modified header handling.
Added William and Jacob to the list of authors to reflect
their participation and suggestions given in the dev@'s email thread (thanks!).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758034 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 13:55:43 +00:00
Stefan Eissing
16e50ff193 update after http2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758014 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 12:43:33 +00:00
Stefan Eissing
aec10f23cc mod_http2: using invalid header callback from nghttp2 1.14.0 onwards
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1758003 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 12:07:16 +00:00
Stefan Eissing
2e6fa9fedc mod_http2: fix for stream buffer handling during shutdown
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757985 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 10:39:24 +00:00
William A. Rowe Jr
555eebaca2 Revert to the correct APLOGNO ID for this case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757924 13f79535-47bb-0310-9956-ffa450edef68
2016-08-26 21:10:08 +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
ac07e050c6 Correct URL failure reporting.
Drop the second reporting of HEAD over HTTP/0.9 requests, we short-circuit
this early now in read_request_line() when presented anything other than
the sole "GET" method permitted by spec.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757921 13f79535-47bb-0310-9956-ffa450edef68
2016-08-26 20:41:55 +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
Luca Toscano
df532849b0 After a long discussion in dev@ I reviewed my previous commit to only warn
the admins about Last-Modified header violations rather than trying
to interpret datestrings (like the ones not in GMT).

I also added explicit comments to summarize the current assumptions,
so it will be easier for somebody in the future to modify the code.

The following use cases are covered:
1) (F)CGI backend sends a Last-Modified header not in GMT and considered in the future by httpd (like now() in the EU/Paris timezone)
2) (F)CGI backend sends a Last-Modified header not in GMT and not considered in the future by httpd (like now() + 2 hours in the PST timezone)
3) (F)CGI backend sends a Last-Modified header in GMT but with a datetime in the future

Suggestions and opinion are really welcome.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757818 13f79535-47bb-0310-9956-ffa450edef68
2016-08-26 11:00:44 +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
Ruediger Pluem
0f6791a582 * Add missing CHANGES entry for r1757662.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757663 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 11:43:55 +00:00
Ruediger Pluem
f0c5598c8c * Add missing copy of hcuri and hcexpr ftom the worker to the health check worker.
PR: 60038
Submitted by: zdeno <zdeno@scnet.sk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757662 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 11:38:07 +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
c14736b0ac Also catch invalid spaces between the URI <> Protocol in StrictWhitespace mode.
(matching the test for the Method <> URI)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757593 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 02:45:18 +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
Stefan Eissing
a6250dc625 mod_http2: give timeout goaway reason when applicable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757540 13f79535-47bb-0310-9956-ffa450edef68
2016-08-24 15:13:12 +00:00
Stefan Eissing
4d2d1017d7 mod_http2: latest h2/state debug draft, fixes in 100-continue response generation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757534 13f79535-47bb-0310-9956-ffa450edef68
2016-08-24 14:44:53 +00:00
Stefan Eissing
0f69ba2dc8 mod_http2: graceful handling of open streams during graceful shutdown
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757524 13f79535-47bb-0310-9956-ffa450edef68
2016-08-24 13:30:11 +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
Jacob Champion
d1e464ca8b docs: rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757281 13f79535-47bb-0310-9956-ffa450edef68
2016-08-22 21:27:19 +00:00
Jacob Champion
1558a12888 docs: update the "SSL Strong Encryption" how-to
The how-to was a little behind the times. Update to modern ciphersuite
selections, and teach the reader more about *why* certain selections and
settings are chosen. Try to future-proof a little bit by including the
"last-reviewed" date and pointing to Mozilla's recommendation tool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757280 13f79535-47bb-0310-9956-ffa450edef68
2016-08-22 21:27:18 +00:00
Joe Orton
b70d7ae5b5 * modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail
if RAND_bytes() fails; possible per API, although not in practice
  with the OpenSSL implementation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757147 13f79535-47bb-0310-9956-ffa450edef68
2016-08-22 11:10:58 +00:00
Yann Ylavic
45d8216e5f mod_proxy_fcgi: revert r1756187.
rpluem: The default is disablereuse=off and the code you removed makes the
default disablereuse=on.

ylavic: so right..


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757097 13f79535-47bb-0310-9956-ffa450edef68
2016-08-21 23:53:24 +00:00
William A. Rowe Jr
9d6d6f9fd4 As commented, ensure we don't flag a request as a rejected 0.9 request
if we identified any other parsing errors and handle all 0.9 request
errors as 400 BAD REQUEST, presuming HTTP/1.0 to deliver the error details.
Do not report 0.9 issues as 505 INVALID PROTOCOL because the client apparently
specified no protocol, and 505 post-dates the simple HTTP request mechanism.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757065 13f79535-47bb-0310-9956-ffa450edef68
2016-08-21 16:50:14 +00:00
William A. Rowe Jr
3a1ebf13ac Yann is correct, % is distinct from reserved and unreserved
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757062 13f79535-47bb-0310-9956-ffa450edef68
2016-08-21 16:12:49 +00:00
Stefan Fritsch
7903412fe1 ap_reclaim_child_processes() ignores its first argument
note this in the docs, add comment


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757061 13f79535-47bb-0310-9956-ffa450edef68
2016-08-21 14:09:00 +00:00
Stefan Fritsch
04038d4d6e Revert "On exit, don't write to other generations' scoreboard slots"
As we have removed the possibility to re-use used scoreboard slots in r1757031,
we don't need this check anymore.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757056 13f79535-47bb-0310-9956-ffa450edef68
2016-08-21 13:06:45 +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
Stefan Fritsch
b0bf11b8e6 mpm_event: don't re-use scoreboard slots that are still in use
This causes inconsistent data in the scoreboard (due to async
connections) and makes it difficult to determine what is going on.
Therefore it is not a useful fix for the scoreboard-full issues (PR
53555).

The consent on the dev list is that we should allocate/use more
scoreboard entries instead.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757031 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 20:48:13 +00:00
Stefan Fritsch
c3293266ce mpm_event: minor code simplification
- move variable initializations into declarations
- use max_workers variable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757030 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 20:45:40 +00:00
Stefan Fritsch
1bde49740f mod_status: note stopping procs in async info table
* add new column "stopping", denoting if a process is shutting down
* add additional "(old gen)", if a process is from before a graceful reload
* add counts of processes and stopping processes to summary line



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757029 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 20:21:39 +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
91af78c1c3 Fix <p> tag closing syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757011 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 16:23:42 +00:00
Christophe Jaillet
96d3d172ea Delay some memory allocation in order to save 272 bytes in the 'request' memory pool if mod_status handler is triggered and is not able to handle the request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757010 13f79535-47bb-0310-9956-ffa450edef68
2016-08-20 15:50:22 +00:00