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
30,080 Commits 62 Branches 313 Tags
trunk-md
Commit Graph

2070 Commits

Author SHA1 Message Date
Jim Jagielski
e85309d373 Make sure updatelbstatus() is NULL 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802845 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-24 17:19:55 +00:00
Luca Toscano
aae1c23f32 mod_proxy_fcgi: Add the support for mod_proxy's 
flushpackets and flushwait params

This change was requested on the development mailing
list in order to fill another gap between mod_fcgi
and mod_proxy_fcgi, namely the -flush funtionality.

The more evolved core trunk code would not need this
feature becuse of the non-blocking writes, but it
is be needed in 2.4.x.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1802040 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-16 08:40:46 +00:00
Jean-Frederic Clere
de15a34dc8 Add logic to read the Upgrade header and use it in the response. 
Use we you are proxying to a server that has multiple upgrade on the same IP/Port.
PR 61142


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1801594 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-11 11:41:44 +00:00
Jacob Champion
856b65e315 proxy_fcgi: remove FPM-specific logic 
Reverts r1780328, r1780329, and their associated followups, which
incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t
regression tests now pass.

PR: 61202

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800306 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-29 17:43:48 +00:00
Jim Jagielski
7a9415519a OK... we display ms, since we want to be able to provide 
values for <1sec, so entries should assume ms input when
using bal-mgr



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799485 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-21 16:29:54 +00:00
Jim Jagielski
d1c3e06c4a allow balancer-manager to also accept subsecond intervals 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799482 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-21 16:24:00 +00:00
Jim Jagielski
428acaded3 Proxy timeout statements now sub-second granularity 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799444 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-21 13:53:56 +00:00
Jim Jagielski
5cc32e6983 unused now 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799438 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-21 13:21:55 +00:00
Jim Jagielski
30923668d1 Allow finer control over hcheck intervals... minimum is whatever 
the watchdog slice is.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1799437 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-21 13:21:18 +00:00
Eric Covener
a30d71c824 remove taint checking from proxy_handler 
rewrite tests with P flag in htaccess broken since r1792169


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797843 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-07 00:24:31 +00:00
Eric Covener
6d14ff6cac whitespace and match 2.4.x 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1797662 13f79535-47bb-0310-9956-ffa450edef68
 2017-06-05 13:13:21 +00:00
Eric Covener
fc1981aa0e whitespace only 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796864 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-30 13:39:45 +00:00
Eric Covener
c46a62d72f remove r1792169 taint checks from proxy and status modules 
Both of these checks are problematic without further
work.

status: even a .htaccess with no SetHandler blocks the handler.
proxy: RewriteRule ... ... [P] in htaccess is blocked.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796352 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-26 21:50:33 +00:00
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