www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
27,383 Commits 62 Branches 306 Tags
6930a7b64dc633c7b6d8417f5529a5a07fd6aafd
Commit Graph

27383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Jaillet
6930a7b64d Allow 0 as a valid value (never close idle connections) 
Increased maximum allowed value to 3600 s (1 hour)
Use 'ap_timeout_parameter_parse' to allow more flexible configuration (i.e. h, min, s, ms suffixes)
Use 'apr_time_from_sec' when applicable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700418 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-01 08:23:01 +00:00
Christophe Jaillet
01d13ed57b Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700338 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:46:23 +00:00
Christophe Jaillet
4356cbd5b3 Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700336 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:44:55 +00:00
Christophe Jaillet
73f505193e Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700335 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:41:18 +00:00
Christophe Jaillet
85082b028d Fix some spurious ident spotted by sparse 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700334 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:37:44 +00:00
Christophe Jaillet
ab3bbfa19a Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700332 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:34:29 +00:00
Christophe Jaillet
9f3e627cb5 Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700331 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:24:21 +00:00
Christophe Jaillet
351a782394 Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700330 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:21:30 +00:00
Christophe Jaillet
fcae67eba7 Remove useless line 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700328 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:17:38 +00:00
Christophe Jaillet
8a804d09ba Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700326 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:13:30 +00:00
Christophe Jaillet
0a16ce1aa5 Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700322 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:56:47 +00:00
Christophe Jaillet
b7cfaea90a Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700321 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:51:05 +00:00
Christophe Jaillet
4ba6c05ebe Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700320 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:50:19 +00:00
Christophe Jaillet
c449c94f28 Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700319 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:49:32 +00:00
Christophe Jaillet
4fb2059a58 Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700318 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:47:12 +00:00
Christophe Jaillet
a4248e423e Fix some spurious ident spotted by sparse 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700317 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:45:24 +00:00
Stefan Eissing
3b807bafc4 better check if c->cs is there at all 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700275 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 16:41:41 +00:00
Stefan Eissing
48f1611c1f explicitly setting connection state on end of processing to help reclaim resources 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700271 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 16:12:11 +00:00
Lucien Gentis
d6f0af233d Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700045 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-29 14:52:49 +00:00
Lucien Gentis
18ed2ec5b6 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700044 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-29 14:51:51 +00:00
Eric Covener
2e31cb317f backported 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698385 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 17:54:44 +00:00
Eric Covener
c8ad597289 On ebcdic systems, make sure E2A conversion happens last, 
so other resource filters looking at or adding ebcdic strings
see ebcdic bytes. e.g. SSI in an EBCDIC file.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698357 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 15:44:29 +00:00
Daniel Gruno
e8ea4c9a72 just a note 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698339 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 14:39:53 +00:00
Daniel Gruno
e76410a124 we have this nwo, don't we? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698338 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 14:31:22 +00:00
Eric Covener
240d6e09d1 Avoid adding duplicate subequest filters, as they would not be stripped 
properly during an ap_internal_fast_redirect.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698334 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 13:13:14 +00:00
Stefan Eissing
cf6c7246d5 first stab at a better SNI vs. request name matching, by accounting for serveralias and wildcards 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698330 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 13:00:52 +00:00
Stefan Eissing
9d99941373 reversal of 1698239 due to nedless loop in t/apache/pr17629.t 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698328 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 12:55:55 +00:00
Daniel Gruno
21ff8a24ca tiny nit. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698256 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 03:53:25 +00:00
Eric Covener
f7a34707da avoid adding multiple subrequest filters when there are nested subrequests. 
Multiple copies of the filter were not stripped properly 
during ap_fast_internal_redirect() which left the EOS buckets
stripped out of the brigade. This results in the end-chunk never
going out on the wire for a chunked response.

observed with mainreq -> directoryindex -> FallbackResource

PR58292



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698239 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-27 22:55:52 +00:00
Stefan Eissing
c6170479d3 giving ap_array_index a start parameter, adding ap_array_contains 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698133 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-27 12:13:59 +00:00
Yann Ylavic
d1ad117a18 Revert r1696960 (see commit thread). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698123 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-27 11:45:06 +00:00
Stefan Eissing
c8fb805f65 Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698116 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-27 11:18:21 +00:00
Stefan Eissing
75b75a69ec Applied patch by normw@gknw.net for ANSI C compliance. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698107 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-27 10:19:36 +00:00
Stefan Eissing
8b52e26df1 moving m4 mod_h2 macro from global to module local config 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698103 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-27 09:43:10 +00:00
Gregg Lewis Smith
98077e4911 Windows traditional build files for mod_h2 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698023 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-26 22:14:16 +00:00
Yann Ylavic
2d58e03018 motorz: fix a compiler warning. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697975 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-26 17:09:20 +00:00
William A. Rowe Jr
70065c297b Drop redundant and harmful macro, API change correctly toggled in mod_lua.c 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697966 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-26 16:17:41 +00:00
Stefan Eissing
c0d80cc90c adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697855 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-26 08:58:45 +00:00
Christophe Jaillet
08a3141d12 Fix an error spotted by sparse. 
Without the parens, the 2 first bits are reseted, instead of just the one for CONDFLAG_NOCASE.

This "bug" looks harmless as the first bit (CONDFLAG_NONE) is never tested.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697735 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-25 16:57:13 +00:00
Stefan Eissing
d3ba2a832f fixing msvc compiler warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697634 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-25 09:56:33 +00:00
Gregg Lewis Smith
281f68d85f Noise reduction 
MSVC != GCC


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697543 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-25 04:17:10 +00:00
Stefan Eissing
5d6c9e84ab removed mod_h2 directives which were experimental and should not support any longer, changed H2Direct to only be enabled by default when not using TLS, conf. to rfc7540 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697446 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 16:07:39 +00:00
Mike Rumph
14459b9d4a Generated doc changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697440 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 15:41:44 +00:00
Stefan Eissing
dc3e8973c9 eliminationg two compiler warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697389 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 13:24:24 +00:00
Stefan Eissing
0af5cc5e42 h2_repsonse across pool lifetimes implementation changed, no longer using calloc 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697370 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 12:48:59 +00:00
Yann Ylavic
b4a695971f Document balancer and balancer-member growth margin reached's behaviour. 
[Reverted by r1700601]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697352 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 10:34:02 +00:00
Stefan Eissing
e586ad099f changed Protocols to let vhosts override servers, removed old H2Engine example from readme 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697339 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 09:26:17 +00:00
Ruediger Pluem
ba6ece3161 * Do a more complete cleanup here. At this point we cannot end up with something useful with the data we created so far. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697323 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-24 07:43:19 +00:00
Lucien Gentis
bcd1ad49c3 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697098 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-22 16:39:58 +00:00
Lucien Gentis
13d977a3b9 XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697097 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-22 16:39:02 +00:00