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

4436 Commits

Author SHA1 Message Date
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
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
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
Jeff Trawick
9b6702a85c Add CGIVar directive for configuring REQUEST_URI behavior 
The goal is to use this one directive to handle any configurable
CGI variable behavior; only one CGI variable is supported initially.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734947 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-14 15:42:45 +00:00
Jeff Trawick
faa748ed66 Fix doc string for QualifyRedirectURL, and related typo in manual 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734835 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-13 18:08:48 +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
Stefan Eissing
f4c13b7a30 declaring ap_create_request for external linkage 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734281 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-09 16:09:35 +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
Yann Ylavic
6d8b9c1b2e mpms: follow up to r1629925: more error reports. 
motorz and simple cases (not in 2.4.x, for now).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733176 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 22:33:24 +00:00
Yann Ylavic
9ed858cd50 mpms: follow up to r1629925: more error reports. 
Failing to setup (or no) listeners is also an error.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733173 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 22:29:50 +00:00
Yann Ylavic
4beeb250a5 mpms: follow up to r1629925: more error reports. 
We want to be able to distinguish errors from stops to exit() with non-zero.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733162 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 22:02:14 +00:00
Yann Ylavic
43d45b073d Revert changes on mpm_event and mpm_worker from r1711479. 
The POD is not used in one process mode for those MPMs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733064 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-01 13:38:18 +00:00
Yann Ylavic
0716aa2949 mpm_motorz: add missing APLOGNO()s. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732958 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-29 22:05:50 +00:00
Christophe Jaillet
a429d04f29 Fix a bug in <UnDefine ...> directive processing. When used, the last <Define...>'ed variable was also withdrawn. 
PR 59019

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732716 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-28 10:55:04 +00:00
Christophe Jaillet
9658877912 Save a few bytes in conf pool when parsing 'Mutex' directive on some OS. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732369 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-25 21:00:46 +00:00
Christophe Jaillet
824640a6f3 Save a few bytes in conf pool when parsing 'DocumentRoot' directive on some OS. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732353 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-25 19:49:21 +00:00
Christophe Jaillet
f115c49281 Save a few bytes in conf pool when parsing 'DefaultRuntimeDir' directive. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732252 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-25 06:51:13 +00:00
Jim Jagielski
9cca911129 use APR 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732229 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-24 20:49:31 +00:00
Jim Jagielski
669b3d55c1 correct type 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732228 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-24 20:49:03 +00:00
Rainer Jung
fad21a6dbc Join multi-line MPM startup log messages into 
single long lines.

Followup to r1725394 and r1725548.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731929 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-23 19:03:00 +00:00
Stefan Eissing
e650f9b1d8 making complete_connection addition compile, hopefully as intended 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731264 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-19 16:07:45 +00:00
Graham Leggett
84051c1c9f mpm: Add a complete_connection hook that confirms whether an MPM is allowed 
to leave the WRITE_COMPLETION phase. Move filter code out of the MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731253 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-19 15:00:05 +00:00
Jim Jagielski
9cb6e6b26c catch by jchampion 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731121 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-18 19:24:04 +00:00
Jim Jagielski
de4ade883b handle compiler warning 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731118 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-18 19:03:10 +00:00
Jim Jagielski
0fecff4b07 Impl ThreadLimit so we can have sane scoreboard sizes :) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731112 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-18 18:48:19 +00:00
Jim Jagielski
663ca17792 ensure sane defaults 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731052 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-18 12:06:39 +00:00
Ruediger Pluem
4f48d0bb34 * c is set to cs->c. So use it. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730865 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-17 15:47:03 +00:00
Jim Jagielski
5589cf4415 Get rid of all this min/max server stuff. Keep it simple. 
We fork a set number of processes and ensure we stay
at that number.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730705 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-16 15:58:01 +00:00
Jim Jagielski
890f8ec47c timer is really just timeout 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730608 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-15 20:37:16 +00:00
Jim Jagielski
ce53073680 start of timeout handling 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730600 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-15 19:48:51 +00:00
Jim Jagielski
c313d572d4 Update the motorz MPM with some logging and some minor fixes... 
Most of the debugs will be removed once more stable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730593 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-15 18:36:39 +00:00
William A. Rowe Jr
0ebed1b38e A rather ugly patch since the code was refactored recently to exclude 
the simple patch for 2.4.x, illustrated below.

Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,
but other 2.5.0-dev specific changes may still be needed on trunk.

--- server/scoreboard.c	(revision 1729907)
+++ server/scoreboard.c	(working copy)
@@ -491,9 +491,8 @@
             ws->conn_bytes = 0;
         }
         if (r) {
-            const char *client = ap_get_remote_host(c, r->per_dir_config,
-                                 REMOTE_NOLOOKUP, NULL);
-            if (!client || !strcmp(client, c->client_ip)) {
+            const char *client;
+            if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {
                 apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
             }
             else {



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729931 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-12 01:19:49 +00:00
William A. Rowe Jr
690c6105f9 hostname: Test and log useragent_host per-request across various modules, 
including the scoreboard, expression and rewrite engines, setenvif,
authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables.
PR55348  [William Rowe]

This is the complete change set which applies cleanly to 2.4.x as well,
the server/scoreboard.c will follow, which does not apply due to drift.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729930 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-12 01:17:03 +00:00
William A. Rowe Jr
9d9b20f5a9 Introduce an ap_get_useragent_host() accessor to replace the old 
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

(Fixed compilation issues noted by Ranier, applies to 2.4.x trunk,
modulo CHANGES and ap_mmn.h)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729929 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-12 01:04:58 +00:00
William A. Rowe Jr
db5f097737 Unwind commit 1729901 (and 1729926), it was not ready for trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729928 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-12 00:46:00 +00:00
Rainer Jung
612f164658 Fix compile error: 
- missing semicolons
- s/req/r/

Followup to r1729901


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729926 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-12 00:18:38 +00:00
William A. Rowe Jr
1dd2be03ad Introduce an ap_get_useragent_host() accessor to replace the old 
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

(Committed previously, but backed out due to unrelated core.c changes)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729901 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-11 21:58:45 +00:00
William A. Rowe Jr
4e46f910d0 Revert r1729897, 1729898, my copy of core.c was polluted by a different patch 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729899 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-11 21:52:12 +00:00
William A. Rowe Jr
6947916643 Introduce an ap_get_useragent_host() accessor to replace the old 
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729897 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-11 21:43:32 +00:00
Eric Covener
4b20f3bf3e 1726233 temporarily broke UDS r->handler case sensitivity 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729374 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-09 12:55:17 +00:00
Christophe Jaillet
df1da7ea92 Remove now useless apr_pstrdup. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728748 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-05 22:24:38 +00:00
Stefan Eissing
140731039d event: slave connection init, vhost early config 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727603 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-29 15:51:25 +00:00
Stefan Eissing
09620c8795 fix for wrong return check on ap_prep_lingering_close(), causing regressions 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727573 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-29 13:13:05 +00:00
Ruediger Pluem
7bbf50d549 * Ensure that proto_num and protocol is set in another "error out early" edge 
case. This can happen with invalid CONNECT requests as described in the PR.

PR: 58929


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727544 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-29 11:36:36 +00:00
Stefan Eissing
e70247afa2 new hook pre_close_connection 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727071 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-27 14:51:53 +00:00
Eric Covener
38a88646a9 from feedback, assume all parameters to SetHandler are expressions. 
I couldnt come up with a plausible handler name that was an 
invalid expression.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726233 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-22 15:30:19 +00:00
Stefan Eissing
44026b36fa expr support for HTTP2 variable 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726167 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-22 10:09:28 +00:00
Jim Jagielski
df23b8a678 revert 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726057 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-21 18:41:21 +00:00
Stefan Eissing
909aa9a87b scoreboard addition of protocol, new ap_udpte_child_status methods 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726009 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-21 16:36:33 +00:00
Jim Jagielski
e0318bf236 expand and err-check... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725766 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-20 17:54:38 +00:00