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
22,315 Commits 62 Branches 313 Tags
input-filter-dev
Commit Graph

1394 Commits

Author SHA1 Message Date
Rainer Jung
219333e4bf Silence compiler warning about signedness differences. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199435 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 20:14:12 +00:00
Stefan Fritsch
75c8dfdfdb More error checking for ap_pregsub 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198988 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-07 22:58:52 +00:00
Stefan Fritsch
8da8c26cd1 Modify placement of PROXY_DECLARE_DATA to fix build problems with MSVC, 
reported by Gregg L. Smith


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196946 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-03 05:35:51 +00:00
Guenter Knauf
9e3448f1c7 Removed prototype which had no implementation. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194940 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-29 17:30:36 +00:00
Stefan Fritsch
b077fe220f add missing 'static' 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1185902 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-18 22:06:36 +00:00
Stefan Fritsch
02302c9049 regex related cleanups: 
- use AP_MAX_REG_MATCH where appropriate
- in mod_proxy_ftp, compile the "ls -s1" regex only once instead of once per request
- add some coments


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1185898 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-18 22:02:26 +00:00
Stefan Fritsch
40b2bb8f92 There is absolutely no reason to have two 4k-sized constant strmatch patterns 
in each per-dir config.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1183475 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-14 19:51:17 +00:00
Stefan Fritsch
69be927748 Force base 10 when parsing the Content-Length. It doesn't matter in this 
case, but in general using strto*(..., 0) for parsing HTTP headers is a bug.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180689 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-09 19:00:51 +00:00
Stefan Fritsch
14db7672ac Remove ap_proxy_removestr(). It has been unused for a decade and has quadratic 
memory usage.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180654 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-09 17:07:17 +00:00
Stefan Fritsch
1951a037bf More cleanup: Expand tabs and some more indentation fixes 
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 18:08:42 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:39:32 +00:00
Jim Jagielski
103f776c25 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:38:09 +00:00
Stefan Fritsch
037e42fb4d Save one call of ap_escape_html on the uri. Reflow code to be more readable. 
Submitted by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
PR: 51697


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1173328 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-20 20:12:51 +00:00
Stefan Fritsch
01ed21af9d Add wrappers for malloc, calloc, realloc that check for out of memory 
situations.  Use them in most places where malloc, and friends are used.
This results in clean error messages in an out of memory situation instead of
segfaulting or silently malfunctioning. In some places, it just allows to
remove some logging code.

PR 51568, PR 51569, PR 51571.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1172686 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-19 16:25:42 +00:00
Stefan Fritsch
2d4e23d88b Create wrapper API for apr_random; 
use in mod_lbmethod_heartbeat and mod_serf to
- replace some needles use of apr_generate_random_bytes
- remove code duplication


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171247 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-15 19:53:59 +00:00
Jim Jagielski
a6f26af093 Implement draining capability for proxy workers... only accept 
sticky on these puppies.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1170256 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-13 17:26:57 +00:00
Jean-Frederic Clere
17d779bff4 Use HTTP_NOT_IMPLEMENTED instead of HTTP_BAD_REQUEST. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166657 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 12:41:30 +00:00
Jean-Frederic Clere
7fa4862380 AJP_EBAD_METHOD is also a bad request so return HTTP_BAD_REQUEST 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166551 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 07:45:40 +00:00
Joe Orton
0b9228e31f * modules/proxy/config.m4: Avoid sh syntax error with 
autoconf 2.63, where an empty "else" clause gets 
  generated from the args if present with only whitespace.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1157094 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-12 13:25:19 +00:00
Stefan Fritsch
24e349de03 mod_proxy_http, mod_proxy_connect: Add 'proxy-status' and 'proxy-source-port' 
request notes for logging

PR: 30195


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154342 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-05 18:35:29 +00:00
Stefan Fritsch
97abc9b6fd Simplify dependency checking code for mod_proxy_fdpass. This also fixes 
mod_proxy_fdpass being built shared even with --enable-mods-static=reallyall.

Document bug/limitiation in APACHE_MODULE macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154126 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-05 08:45:28 +00:00
Stefan Fritsch
9bd21d2c8a Forbid some directives in .htaccess because of AllowOverrideList: 
core:          AllowOverride, AllowOverrideList
mod_authn_dbd: AuthDBDUserPWQuery, AuthDBDUserRealmQuery
mod_authz_dbd: AuthzDBDQuery, AuthzDBDRedirectQuery
mod_proxy:     BalancerMember, ProxySet

Adjust for use in .htaccess:
mod_actions:   Script


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153687 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-03 22:10:27 +00:00
Ruediger Pluem
c0ac7adb66 * Do not even sent an empty brigade down the filter chain if the headers 
have not been sent by the AJP server so far. Even an empty brigade
  will trigger the headers filter to create the (in this case incomplete)
  HTTP headers of the response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153531 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-03 15:07:29 +00:00
Stefan Fritsch
37e5132bd6 Fix compiler warning 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153511 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-03 14:39:21 +00:00
Rainer Jung
966df72b7c Improve logging for mod_proxy_ajp. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152452 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-30 10:58:34 +00:00
Rainer Jung
3c52446a2b Slightly reorganize previously unused dump method. 
Add AJP packet log method on top of dump method.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152451 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-30 10:56:41 +00:00
Rainer Jung
a7fe66131c Make AJP trace messages a bit less cryptic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152450 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-30 10:54:04 +00:00
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