www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
29,900 Commits 62 Branches 313 Tags
httpdunit
Commit Graph

2057 Commits

Author SHA1 Message Date
Christophe Jaillet
800af53861 Remove a space to synch with 2.4.x. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793314 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-01 11:58:37 +00:00
Eric Covener
b7735544ee despite trace, assign a APLOGNO, as done elsewhere in this mod 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792395 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-23 21:27:15 +00:00
Eric Covener
8af890b8f8 PR61012: log a trace message on tunnel shutdown 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792394 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-23 21:26:37 +00:00
Nick Kew
38e269322b Introduce request taint-checking concept. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792169 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-21 08:44:06 +00:00
Jean-Frederic Clere
61ca36599d Add upgrade parameter to mod_proxy_wstunnel. 
That allows to upgrade to jboss-remoting for example
or to run an HTTP/1.1 backend that needs to upgrade to
WebSocket.
See also:
 https://issues.jboss.org/browse/JBCS-254
 https://issues.jboss.org/browse/JBCS-291


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792092 13f79535-47bb-0310-9956-ffa450edef68
 2017-04-20 17:07:32 +00:00
Jim Jagielski
3751183add suggestion from ylavic 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789387 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-29 17:09:32 +00:00
Eric Covener
3555d2d597 drop the longhand version 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788040 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-22 00:00:30 +00:00
Jim Jagielski
cf85d9f6e6 final tune and preventative coding 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786009 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-08 16:31:05 +00:00
Jim Jagielski
053c3520fa Defensive 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1785871 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-07 19:10:19 +00:00
Jim Jagielski
3d822138b5 More granular logging 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784275 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-24 13:04:49 +00:00
Jim Jagielski
d02badb296 Instead of thread-pools for each server/context, use a server-wide 
top-level threadpool, which is more efficient.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784228 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-24 04:49:38 +00:00
Jim Jagielski
13f6901c24 Since ProxyHC* values are per-server, we need to loop thru all per-server 
contexts. No need for each server/vhost to have it's own watchdog instance,
however.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784227 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-24 04:28:28 +00:00
Jim Jagielski
72d18f87f9 Use single top-level context and have the callback loop thru all servers/vhosts. Adjust server_rec 
as required

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784205 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-23 21:24:04 +00:00
Jim Jagielski
2501a90242 Work on all servers, not just top-level... Each Vhost has its own context and watchdog instance. We may need to revisit this and have just one instance 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784203 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-23 20:54:47 +00:00
Yann Ylavic
b24e686f57 Follow up to r1780327 and r1780329: mute update-log-tags. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783767 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-20 14:08:27 +00:00
Jacob Champion
2c70ed7562 ProxyFCGISetEnvIf: reject invalid invocations, streamline unsets 
Neither of the following makes sense:
- ProxyFCGISetEnvIf cond !VARIABLE value
- ProxyFCGISetEnvIf cond !

Error out in these cases. Also, don't execute the (unused) replacement
expression when unsetting.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782532 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-10 21:31:13 +00:00
Eric Covener
94167768e7 support unsetting vars 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782482 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-10 15:25:25 +00:00
Jacob Champion
457a723537 mod_proxy_fcgi: allow setting empty variables in ProxyFCGISetEnvIf 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782419 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-09 23:59:15 +00:00
Jacob Champion
e5aac6970e mod_proxy_fcgi: fix spelling in APLOG_INFO message 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782418 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-09 23:59:14 +00:00
Jim Jagielski
54cb64ca1b Allow final admin-level fine-tuning 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782323 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-09 12:58:35 +00:00
Jim Jagielski
7635969d8d Remove trailing whitespace : no functional change 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782193 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-08 14:53:05 +00:00
Yann Ylavic
bcb2cebac8 Follow up to r1782164: fix typo (closing double-quote). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782166 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-08 13:33:13 +00:00
Jim Jagielski
2eef117666 Logging update 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782164 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-08 13:23:36 +00:00
Eric Covener
8c772d56ee add ProxyFCGISetEnvIf 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781329 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-01 23:07:53 +00:00
Eric Covener
37c5465898 add no-proxy envvar for mod_proxy 
replacement for ProxyPass /path ! when ProxyPass is in
location context.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781328 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-01 22:33:10 +00:00
Eric Covener
e2e6e5194f revert r1780909 and r1773397 ProxyPass ! perdir 
r1773397 had a regression and the whole thing is fishy
to shoehorn the current ProxyPass ! syntax into.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781324 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-01 22:11:49 +00:00
Eric Covener
db1c9beec9 "fix" regression in r1773397. 
committing for discussion purposes to trunk.  I have reopened PR60458 because
I am tempted to revert the entire thing, it was not really a release-to-release
regression because the reporter arbitrarily used a new 2.4 syntax and the semantics
were unclear.

It is useful to have global exceptions apply to per-location proxypass, but it totally
breaks the "fast" lookup part of it.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780909 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-30 12:59:09 +00:00
Jim Jagielski
456d07fce5 debugging 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780329 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-26 03:52:35 +00:00
Jim Jagielski
0b1a529705 Adjust as needed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780328 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-26 03:52:34 +00:00
Jim Jagielski
232be9a3b1 debug 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780327 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-26 03:52:31 +00:00
Yann Ylavic
2ddc069451 mod_proxy_hcheck: follow up to r1779574. 
Parse/validate response bodies.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779623 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-20 13:18:58 +00:00
Yann Ylavic
526ae59d90 mod_proxy_hcheck: Don't validate timed out responses. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779574 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-20 08:30:00 +00:00
Yann Ylavic
632f491b62 mod_proxy_hcheck: thread-safety. 
Use the thread pool everywhere for the needs/lifetime of the request to
the backend.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779573 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-20 08:23:28 +00:00
Jim Jagielski
1bf31af8b6 Allow -DHC_USE_THREADS=0 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779349 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-18 15:46:58 +00:00
Christophe Jaillet
78d4351137 Follow-up to r1778350 
Remove useless tests in order to avoid the duplication of a message.
Be consistent with "FPM" vs "PHP-FPM" usage messages.
Fix style issues.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778500 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-13 07:22:29 +00:00
Eric Covener
728cb09d13 PR60576: php-fpm broken w/ per-dir rewrites 
Attempt to dig out of well-meaning fixes for generic fcgi backends
that negatively affected some FPM configs.

Adds ProxyFCGIBackendType 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778350 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-11 20:58:33 +00:00
Eric Covener
3dac6889c2 followup to r1776285 
backwards per rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778117 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-10 13:20:26 +00:00
Jim Jagielski
cc97ce3e52 https://bz.apache.org/bugzilla/show_bug.cgi?id=58855 
Optimize check for empty strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778067 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 22:08:01 +00:00
Christophe Jaillet
e0f539c438 Move definition of ASCII_ZERO to httpd.h and rename it ZERO_ASCII for consistancy reason. 
Remove definition of ASCII_CRLF which is the same as CRLF_ASCII.

Use ZERO_ASCII and CRLF_ASCII in mod_proxy_http

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777611 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-06 13:58:03 +00:00
Yann Ylavic
07ad86dc70 proxy: don't force global module selection (most) and scope (shared/static), 
since it breaks --enable-modules=none + exhaustive --enable-foo(s).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1777464 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-05 12:50:24 +00:00
Eric Covener
c5f5760b7e let wstunnel run first 
Since wstunnel can step aside based on the Upgrade: header.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776290 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-28 14:54:37 +00:00
Eric Covener
281b96b078 improve a debug message 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776285 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-28 14:40:54 +00:00
Luca Toscano
ef6fbcf590 Return HTTP 504 rather than 503 when a proxy timeout is hit. 
Part of the review for PR: 56188



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1775858 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-23 17:34:11 +00:00
Yann Ylavic
0674872c16 mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established 
backend connection, happening with LogLevel trace2 or higher configured,
or at any log level with compilers not detected as C99 compliant (e.g.
MSVC on Windows).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1775775 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-22 23:30:05 +00:00
Eric Covener
ff7722bc9a ProxyPass ! doesn't block per-directory ProxyPass 
*) mod_proxy: Honor a server scoped ProxyPass exception when ProxyPass is
     configured in <Location>, like in 2.2. PR 60458.
     [Eric Covener]


reverted in r1781324


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773397 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-09 14:00:51 +00:00
Gregg Lewis Smith
280008d94d add mod_proxy_hcheck to legacy build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1771839 13f79535-47bb-0310-9956-ffa450edef68
 2016-11-29 03:27:37 +00:00
Jacob Champion
a9cf5db169 mod_proxy: log diagnostics during ProxyPass[Match] 
To help out users when debugging ProxyPass and ProxyPassMatch, log all
match attempts (at trace2), as well as matches that are either
successful or explicitly disabled (at trace1).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1762517 13f79535-47bb-0310-9956-ffa450edef68
 2016-09-27 16:59:21 +00:00
Luca Toscano
333632287c Fix stupid mistake introduced in r1759984 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1760018 13f79535-47bb-0310-9956-ffa450edef68
 2016-09-09 13:33:49 +00:00
Luca Toscano
5a53fac726 mod_proxy_fcgi: handle the HTTP 412 use case 
This is a follow up of http://svn.apache.org/r1752347;
ap_meet_conditions could return a 412 status that if not
handled causes subsequent bogus reads and wrong messages
logged (like AH01070). After a chat on dev@ the feedback
was to couple HTTP_NOT_MODIFIED with HTTP_PRECONDITION_FAILED,
but any other feedback is welcome.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1759984 13f79535-47bb-0310-9956-ffa450edef68
 2016-09-09 11:17:36 +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