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
28,393 Commits 62 Branches 306 Tags
02722235f73dd0ca2a55bc06a67b57bc763563cb
Commit Graph

9853 Commits

Author SHA1 Message Date
Stefan Eissing
02722235f7 mod_http2: oops, forgot a rename 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735609 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 14:30:17 +00:00
Stefan Eissing
9ee8aad012 mod_http2: some cleanup in GGOAWAY handling, disabling PUSH when rmeote sends GOAWAY 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735608 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-18 14:24:13 +00:00
Stefan Eissing
c39942664a revert of r1735444 as leaking, fix in task filter removal 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735451 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 16:25:47 +00:00
Stefan Eissing
eb09b029d9 mod_http2: pushing slave conn setup outside of lock area 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735444 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 15:22:09 +00:00
Stefan Eissing
07d45e357e mod_http2: slave connections are reused 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735416 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-17 12:55:11 +00:00
Yann Ylavic
5bc7c3ca2d mod_ssl: follow up to r1734561. 
Simplify CRL check mode and flags handling/merging by using a single mask (int).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735337 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-16 22:54:27 +00:00
Stefan Eissing
e6622f1d5e update changes after backport, version bump mod_http2 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735240 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-16 15:18:04 +00:00
Stefan Eissing
ba1fbba024 mod_http2: fix for bucket lifetime on master conn, mod_proxy_http2: flow control from front- to backend h2 connection 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735230 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-16 14:01:53 +00:00
Stefan Eissing
7c6d768d77 reverting the reverting of r1735174, r1735176 was the culprit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735227 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-16 13:09:47 +00:00
Stefan Eissing
c4cf57c511 reverting r1735176 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735226 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-16 13:00:37 +00:00
Stefan Eissing
9a54010ad2 reverting r1735174 as http/1.1 just terminated before response 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735216 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-16 11:06:28 +00:00
Graham Leggett
20ede5ebda mod_http: Make sure HTTP filters are added on HTTP requests only. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735176 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-15 23:13:43 +00:00
Graham Leggett
008d76cc3f mpm: Generalise the ap_mpm_register_socket functions to accept pipes or sockets. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735174 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-15 22:52:51 +00:00
Yann Ylavic
45d8a4c9c0 mod_ssl: follow up to r1734561. 
Use the right crl_check_flags in ssl_callback_SSLVerify(), can be either
a client or proxy connection here.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735159 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-15 19:13:36 +00:00
Eric Covener
c1922e4d0c [PATCH] mod_rewrite: double escaping of query strings in server context 
(like PR50447, for server context)

Submitted By: Evgeny Kotkov <evgeny.kotkov visualsvn.com>
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735088 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-15 14:57:46 +00:00
Stefan Eissing
93b8969292 sharing bucket_alloc for all streams inside mplx, explicit lifetime handling of EOR bucket and tasks 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734957 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-14 16:43:52 +00:00
Stefan Eissing
2d292b96bb mod_http2: update after backport, version bump 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734919 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-14 11:09:21 +00:00
Stefan Eissing
b76ba37de1 mod_http2: allowing requests without :authority header 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734910 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-14 10:48:54 +00:00
Jeff Trawick
33931c9953 mod_include now sets DOCUMENT_ARGS. 
* Like DOCUMENT_URI, this is for the SSI document, not for any
  subrequest called for the include directive.
* Like QUERY_STRING, this is just r->args (or empty string if there are
  none), unlike QUERY_STRING_UNESCAPED.

The name of the variable is taken from the Zeus SSI implementation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734817 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-13 15:29:38 +00:00
Graham Leggett
64eaf888e9 core: Extend support for setting aside data from the network input filter 
to any connection or request input filter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734656 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-12 00:43:58 +00:00
Christophe Jaillet
9fbfe2fc90 Silent a smatch warning: 
mod_auth_form.c:626 get_form_auth() warn: variable dereferenced before check 'sent_user' (see line 616)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734635 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-11 21:16:48 +00:00
Stefan Eissing
698e1835a8 mod_http2: avoid unnecessary out flushing, avoid scoreboard updates unless code/msg changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734575 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-11 15:06:54 +00:00
Stefan Eissing
e79ca3e9da mod_http2: simpler flushing on master out 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734571 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-11 14:18:18 +00:00
Yann Ylavic
bafafe600b mod_ssl: Add no_crl_for_cert_ok flag to SSLCARevocationCheck directive 
to opt-in previous behaviour (2.2) with CRLs verification when checking
certificate(s) with no corresponding CRL.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734561 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-11 13:51:17 +00:00
Stefan Eissing
cdfb2f5fd6 mod_proxy_http2: using SUSPENDED from handler when passing request_rec to other engine 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734549 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-11 12:59:29 +00:00
Stefan Eissing
4dbe05c0ad mod_http2: some more code cleanup 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734434 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-10 17:06:57 +00:00
Stefan Eissing
a082ae1643 mod_http2: some code cleanup of stream request body handling, potential avoid a buffer copy 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734428 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-10 15:51:14 +00:00
Stefan Eissing
01e753851c update after backport, bumnping mod_http2 internal version number after backport to 2.4 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734417 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-10 14:02:14 +00:00
Fabien Coelho
e61c6977c7 mod_authz_host: add a new "forward-dns" authorization type 
This new type does not rely on reverse DNS lookups.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734412 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-10 13:33:31 +00:00
Stefan Eissing
f2a1c64ee4 netware build patch by NormW, v3 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734372 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-10 09:28:25 +00:00
Eric Covener
3de1240063 followup to r1734125: null check for r->args 
before cleaning up some QSA cases.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734294 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 18:23:23 +00:00
Stefan Eissing
1ba198299b netware build patches by NormW 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734286 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 16:52:55 +00:00
Stefan Eissing
e79d2bb45e mod_http2: more safe approach to async mpm keepalive connection handling 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734274 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 15:37:52 +00:00
Stefan Eissing
069d8c1ee6 mod_proxy_http2: rescheduling of requests not processed by backend on GOAWAY 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734253 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 14:51:33 +00:00
Yann Ylavic
db638b6bc3 mod_reqtimeout: Prevent long response times from triggering a timeout once 
the request has been fully read.  PR 59045.

Adds an output filter which detects EOR buckets and resets the timeout so
that the input filter does nothing (until the next request is read).

This makes the bypass of nonblocking+speculative in reqtimeout_filter()
useless, and by removing it we can detect potential timeout for speculative
reads outside check_pipeline() earlier (the code to not extend the timeout 
for speculative reads is still there to prevent those from biasing until the
real/relevant data).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734239 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 13:43:53 +00:00
Stefan Eissing
096bc816ac mod_proxy_http2 documentation, addition of request notes proxy-status and proxy-source-port 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734238 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 13:41:16 +00:00
Stefan Eissing
28d50b0579 mod_proxy_http2: single engine per type per master connection, removing some race conditions on engine exit, mod_http2: better debug logging by tagging slave connection with task id 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734221 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 11:51:25 +00:00
Eric Covener
9abfad5705 mod_rewrite: Add QSL|qslast flag to allow rewrites to files with 
literal question marks in their names. 

PR 58777. 




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734125 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-08 19:18:15 +00:00
Stefan Eissing
28777fa091 mod_proxy_http2: stability improvements 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734097 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-08 14:22:34 +00:00
Graham Leggett
56a1aecacc core: Split ap_create_request() from ap_read_request() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734009 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-07 23:55:08 +00:00
Graham Leggett
1bd0dcce6d mod_ssl: Don't lose track of the SSL context if the ssl_run_pre_handshake() 
hook returns an error.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734006 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-07 23:40:17 +00:00
Stefan Eissing
ebd03293e6 mod_http2: support for several different request engines per connection, fixes CVE-2016-1546 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733727 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-05 15:45:12 +00:00
Christophe Jaillet
e4c0735413 Use ap_array_str_contains to simplify code 
Remove a useless test (groups is always NULL)
Improve some style

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733691 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-05 07:15:55 +00:00
Christophe Jaillet
f2972d5e61 Use ap_array_str_contains to simplify code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733523 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-03 20:57:59 +00:00
Stefan Eissing
b1f32038a4 mod_http2: version bump, fixing max connection workers when max workers not configured 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733275 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-02 12:51:53 +00:00
Stefan Eissing
a46258f6bb adding default port numbers for h2/h2x proxy schemes, by jchampion 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733239 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-02 09:51:05 +00:00
Stefan Eissing
c828bbc586 mod_http2: some DoS protection, fix for read after free 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733113 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 17:19:25 +00:00
Yann Ylavic
7614326743 mod_proxy: follow up to r1729826 + r1729847 + r1732986. 
Don't use magic constants.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733056 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 12:35:01 +00:00
Yann Ylavic
9a6583a778 Revert r1733054: spurious commit of being-worked mod_reqtimeout changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733055 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 12:33:50 +00:00
Yann Ylavic
f3008b6253 mod_proxy: follow up to r1729826 + r1729847 + r1732986. 
Don't use magic constants.

Reverted by r1733055, re-commited without spurious changes in r1733056.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733054 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 12:31:40 +00:00