1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Commit Graph

1417 Commits

Author SHA1 Message Date
Rainer Jung
bed1021e56 Move some debug log statements to trace level
and improve message format consistency.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152448 13f79535-47bb-0310-9956-ffa450edef68
2011-07-30 10:49:32 +00:00
Rainer Jung
73cf5b7f29 mod_proxy_ajp: Respect "reuse" flag in END_REPONSE
packets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152379 13f79535-47bb-0310-9956-ffa450edef68
2011-07-29 21:41:00 +00:00
Nick Kew
9da1f57443 mod_proxy: enable absolute URLs to be rewritten with ProxyPassReverse,
e.g. to reverse proxy "Location: https://other-internal-server/login" with
ProxyPassReverse https://public-address/ https://other-internal-server/



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152273 13f79535-47bb-0310-9956-ffa450edef68
2011-07-29 15:40:19 +00:00
Stefan Fritsch
c26b0e42af adjust mod_proxy build defaults:
Change the default for mod_proxy from 'reallyall' to 'most'.

Most mod_proxy_* modules default to whatever mod_proxy is set to.
Do this for mod_proxy_express, too (was explicit 'most').
Change mod_proxy_mods_fdpass to explicit 'all'.

See thread at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C201107052321.56063.sf@sfritsch.de%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150467 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 18:59:25 +00:00
Guenter Knauf
9789e8e0e3 Added new proxy modules to NetWare build.
Submitted by: NormW <normw gknw net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1148734 13f79535-47bb-0310-9956-ffa450edef68
2011-07-20 12:44:09 +00:00
Guenter Knauf
03d2437edb Added forgfotten .dsp bits - my bad.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1148078 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 22:31:04 +00:00
Stefan Fritsch
beb3ea9c11 Add more (trace) logging to the ap_scan_script_header*() functions
Add ap_scan_script_header*_ex() functions that take a module index for
logging.
Make mod_cgi, mod_cgid, mod_proxy_fcgi, mod_proxy_scgi, mod_isapi use the
new functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147493 13f79535-47bb-0310-9956-ffa450edef68
2011-07-16 21:53:18 +00:00
Jeff Trawick
7eb1caed9a fix def'n of AP_SLOTMEM_PROVIDER_VERSION, use it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146737 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 14:47:59 +00:00
Rainer Jung
a68daf2a82 Allow to specify module specific custom linker flags
via the MOD_XXX_LDADD variables.

Use APR_ADDTO instead of APR_SETVAR or direct
variable assignment.

This is especially useful when building mod_lua
or mod_deflate against a lua resp. libz which
are installed in non-standard locations.
One can add "-R ..." to MOD_LUA_LDADD and
MOD_DEFLATE_LDADD before configure to fix
the RPATH/RUNPATH of those modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142938 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 09:24:23 +00:00
Rainer Jung
9ed2afa2b9 Tolerate dependency checking failures in configure
for modules that have been enabled only implicitely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142892 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 05:31:22 +00:00
Stefan Fritsch
51692222f6 Various code cleanup
PR: 51398
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138627 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 20:45:34 +00:00
Stefan Fritsch
59c52538f3 Code cleanup: replace apr_table_set with non-copying apr_table_setn
in a few places

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137413 13f79535-47bb-0310-9956-ffa450edef68
2011-06-19 18:50:12 +00:00
Stefan Fritsch
fba947527f Introduce new function ap_get_conn_socket() to access the socket of
a connection


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135153 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 16:02:18 +00:00
Stefan Fritsch
48345b21d0 Avoid some memory allocations by using apr_table_setn where the string arguments
are allocated from the request pool and not modified later on.

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51358


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135084 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 11:04:29 +00:00
Stefan Fritsch
f66af00c19 Avoid some memory allocations by using apr_table_setn where the string
arguments are const.

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51357


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135083 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 10:58:10 +00:00
Stefan Fritsch
c9fd2623da Introduce ap_(get|set)_core_module_config() functions/macros and use them
everywhere.

We know that the core module has module_index 0. Therefore we can save
some pointer operations in ap_get_module_config(cv, &core_module) and
ap_set_module_config(cv, &core_module, val). As these are called rather often,
this may actually have some (small) measurable effect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132781 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 21:26:56 +00:00
Stefan Fritsch
51226bdcca Fix various "variable 'x' set but not used" warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125877 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 07:42:18 +00:00
Stefan Fritsch
65c04f6b24 Replace some "apr_p[c]alloc / memcpy" constructions into a single apr_pmemdup()s
PR: 51214
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125818 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21 21:06:15 +00:00
Jim Jagielski
e075565180 Add in BalancerGrowth and its functionality... this lays
the framework for adding additional Balancers: post-config
by allowing for shm growth.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125451 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 16:29:48 +00:00
Jim Jagielski
3da4ecd815 Add in proxy-scgi-pathinfo and proxy-fcgi-pathinfo envvars
to allow "best guess" calculation of PATH_INFO for backend
FCGI/SCGI servers

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1124979 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 15:58:15 +00:00
Jim Jagielski
de3a875a59 Oops... wrong branch.
allocate from pool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1124793 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 14:00:32 +00:00
Jim Jagielski
9e15f63122 Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102734 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 13:48:31 +00:00
Jim Jagielski
a63ae1c31d Add in new mod_proxy "extension" module: mod_proxy_express.
This is a module developed by myself to support the
RedHat OpenShift Express project, to allow for dynamic
and fast reverse-proxy switching.

The idea is to easily map Host: header entries to
backend servers, with the mapping done in a DBM file
(think of mod_vhost_alias, kinda, for mod_proxy).
Yeah, mod_rewrite and RewriteMap could kinda do
it but (1) that is slow and (2) no support for
ProxyPassReverse capability.

Donated to the ASF.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102733 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 13:46:43 +00:00
Stefan Fritsch
61a0413706 Use APR_STATUS_IS_... in some more cases.
While this is not strictly necessary everywhere, it makes it much easier
to find the problematic cases.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102124 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 22:51:46 +00:00
Jim Jagielski
2aef21903c Cleanup... most don't need apr_hooks.h at all...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101067 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 15:36:32 +00:00
Eric Covener
7ae5a61329 replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1100513 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 11:41:59 +00:00
Guenter Knauf
e35a1a09d2 Fixed missing struct member error introduced with r1092076.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092212 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 13:05:48 +00:00
Jean-Frederic Clere
6794d36d02 try to prevent a single long request marking a worker in error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092076 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 09:36:14 +00:00
Jim Jagielski
4e65550633 better error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1088620 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 13:37:57 +00:00
Guenter Knauf
4be15ef43a Fixed only some proxy prototype formats.
Function names must follow the *_DECLARE() in the same
line regardless how long the function names are!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1088421 13f79535-47bb-0310-9956-ffa450edef68
2011-04-03 21:37:20 +00:00
Guenter Knauf
f8aea5810c Fixed NetWare build for proxy modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1088326 13f79535-47bb-0310-9956-ffa450edef68
2011-04-03 15:33:08 +00:00
Jim Jagielski
b8d9a25867 *) mod_proxy_ajp: Add support for 'ProxyErrorOverride on'. PR 50945.
[Peter Pramberger <peter pramberger.at>, Jim Jagielski]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087864 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 19:25:26 +00:00
Jim Jagielski
d80376cdab *) mod_proxy_fcgi: Add support for 'ProxyErrorOverride on' PR 50913.
[Mark Montague <mark catseye.org>, Jim Jagielski]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087863 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 19:25:23 +00:00
Jim Jagielski
b8999572c0 Make the 'need to reset' more generic by extending its reach
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087415 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 19:29:21 +00:00
Jim Jagielski
6017c4a100 Better knowledge of when to adjust.
More info from b-m

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087413 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 19:20:06 +00:00
Jim Jagielski
b405eca038 Implement reset() funcs for the LBmethods...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087407 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 18:41:23 +00:00
Jim Jagielski
5c1603996e If we change the LB method, or we take add in a new
balancermember ("enable" her), then we need to have the
LBmethod reset its params as required...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087371 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 17:00:36 +00:00
Jeff Trawick
562c645ad6 change signed single-bit fields to unsigned
some of these were exposed to mods so the mmn is bumped, without
regard to whether any compiler will have to generate different
code


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086662 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 18:20:52 +00:00
William A. Rowe Jr
534cbfe22c Resolve disagreement with its prototype
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086287 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 15:50:34 +00:00
Guenter Knauf
888ec80125 Use a var INSTALLBASE to simplify NetWare installation rules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 04:56:06 +00:00
Guenter Knauf
bab978c56e Use var for prelude so its possible to change it at one place.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 03:09:27 +00:00
Jeff Trawick
4598f1a7d4 fix some grammar mistakes, mostly in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-12 00:35:39 +00:00
Guenter Knauf
2dc89e951b NetWare build overhaul in order to compile on Linux.
Some more fixes ...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079614 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 00:19:31 +00:00
Guenter Knauf
e8a8becc0f NetWare build overhaul in order to compile on Linux.
Removed absolute paths to imp files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079487 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 18:59:02 +00:00
Guenter Knauf
46b7e1d210 NetWare build overhaul in order to compile on Linux.
Take 1.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079407 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 16:04:40 +00:00
Jim Jagielski
b6debecc34 Fix/workaround for BUGZ PR 50851.
By default, mod_proxy_fcgi with not create PATH_INFO, unless
specifically told to.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1078089 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 18:31:17 +00:00
Jeff Trawick
f63c745050 axe some useless or debug-inhibiting error checking
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1075064 13f79535-47bb-0310-9956-ffa450edef68
2011-02-27 14:38:17 +00:00
Jeff Trawick
ae6a997ddf fix function name in log text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074659 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 18:25:57 +00:00
Jim Jagielski
f0da266ae4 protect one-off boundary
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1073728 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 13:03:58 +00:00
Jim Jagielski
63c7cfdf0d Be at least somewhat more RESTful... Use POST for changing stuff.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1073520 13f79535-47bb-0310-9956-ffa450edef68
2011-02-22 21:43:44 +00:00