e2848831fe
More C90 stuff...
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810447 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02 15:28:42 +00:00
78ae561712
Final comment-format changes
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810365 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02 14:39:56 +00:00
7a6038c97e
And standard format - no functional change
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810363 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02 14:36:42 +00:00
33dc920f47
C changes / C90/C89
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810362 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02 14:35:33 +00:00
da54e90dda
Fold in ALv2 licensed UWSGI proxy (sub)module as acknowledged via
...
https://github.com/unbit/uwsgi/issues/1636
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810358 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02 14:20:15 +00:00
f77ced89e7
format typo
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1808723 13f79535-47bb-0310-9956-ffa450edef68
2017-09-18 14:17:04 +00:00
9c60ed2473
mod_proxy_fcgi: follow up to r1807876.
...
Fix mixed declarations and code [-Wdeclaration-after-statement].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1808014 13f79535-47bb-0310-9956-ffa450edef68
2017-09-11 10:49:13 +00:00
449105a615
mod_proxy_fcgi: limit the flush buckets inserted when flushpackets=on|auto
...
This commit is a follow up of r1802040 based on Jacob's
feedback, namely inserting the FLUSH buckets only when
really needed and useful, not always.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807876 13f79535-47bb-0310-9956-ffa450edef68
2017-09-09 10:24:19 +00:00
c6ecf742f2
Make sure that ajp behaves like http.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807338 13f79535-47bb-0310-9956-ffa450edef68
2017-09-05 10:58:26 +00:00
92f22d68c0
Fix for JBCS-390.
...
Note it is related to PR 59007
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807318 13f79535-47bb-0310-9956-ffa450edef68
2017-09-05 07:27:33 +00:00
5a2cce3163
Fix a compilation warning introduced by r1802040.
...
mod_proxy_fcgi.c:893:19: warning: ‘flushpoll’ may be used uninitialized in this function [-Wmaybe-uninitialized]
This warning is a false positive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805490 13f79535-47bb-0310-9956-ffa450edef68
2017-08-19 07:42:16 +00:00
8dc841ea11
Fix remaining lint from ms capability for hchecks.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805206 13f79535-47bb-0310-9956-ffa450edef68
2017-08-16 15:14:48 +00:00
221ddb4fe1
Update offsets
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805195 13f79535-47bb-0310-9956-ffa450edef68
2017-08-16 13:41:39 +00:00
737e70ca1f
Umm. This is C :)
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805190 13f79535-47bb-0310-9956-ffa450edef68
2017-08-16 13:07:31 +00:00
d248d8b2ff
loadfactor now decimal
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805188 13f79535-47bb-0310-9956-ffa450edef68
2017-08-16 12:57:41 +00:00
25c4764422
Fix ProxyAddHeaders merging.
...
* modules/proxy/mod_proxy.h:
Add add_forwarded_headers_set field to proxy_dir_conf.
* modules/proxy/mod_proxy.c (create_proxy_dir_config, ):
Initialize add_forwarded_headers_set.
(add_proxy_http_headers): Set it.
(merge_proxy_dir_config): Merge add_forwarded_headers correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805099 13f79535-47bb-0310-9956-ffa450edef68
2017-08-15 16:54:22 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
