www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity
22,500 Commits 62 Branches 304 Tags
c7f1896fa72eafc46943b51a07b72634fda93ca3
Commit Graph

1417 Commits

Author SHA1 Message Date
Jim Jagielski
1eeb516b64 Use 2 sep hashing functions to account for collisions... 
Safe enough

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208897 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-01 00:02:30 +00:00
Stefan Fritsch
4554d337cc Remove some getpid() logging, this is now also included in the error log 
format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208835 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 22:15:55 +00:00
Guenter Knauf
dec6ef22c7 Added missing proxy import to Netware build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208533 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 17:28:47 +00:00
Jim Jagielski
9846e4bac9 use a style sheet... ideally we would pull one off the filesystem, 
but for now...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208411 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-30 13:15:24 +00:00
Stefan Fritsch
b4ec041ba7 Remove more log message prefixes that are now redundant as the 
the error log format includes the module name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208110 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 22:28:21 +00:00
Jim Jagielski
619f36bf80 Ensure casing doesn't matter... (we know balancer->s->name is 
lc)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208069 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 21:14:47 +00:00
Jim Jagielski
e13a723904 Some optimization... we have a hash, use it. Quicker than all 
these string comparisons.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208068 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 21:14:08 +00:00
Jim Jagielski
cde53e72f0 whitespace 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208067 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 21:14:03 +00:00
Jim Jagielski
d2e320f509 Logic which makes the balancer "active" or not... so we can turn them 
off and on as needed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207926 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 15:36:11 +00:00
Jim Jagielski
109bd135e1 Instead of running thru all kinds of logic paths, just add in 
a on/off bit... No need for other balancer statuses(sp)?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207863 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-29 13:12:43 +00:00
Jim Jagielski
71f487a7b9 Expose the path that the balancer handles... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207582 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 20:46:53 +00:00
Jim Jagielski
ef5be92f5e Pull this out as a sep function to allow for full vhosting 
adjustment between get and define balancers...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207562 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 20:11:44 +00:00
Jim Jagielski
c4ec235bb0 "Final" (I hope) proxy struct/API changes in order to support 
dynamic balancer allocation AND dynamic vhost-balancers

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207467 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 17:10:17 +00:00
Jim Jagielski
b896ababf5 Error-check. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207282 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 15:11:03 +00:00
Graham Leggett
394e5594d6 Introduce a per connection "peer_ip" and a per request "client_ip" to 
distinguish between the raw IP address of the connection and the effective
IP address of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206291 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 19:42:04 +00:00
Jim Jagielski
984c3a345c Move useful and shared balancer stuff to the shm slot... 
Provide hooks for post-config/runtime addition of
balancers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206286 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 19:28:14 +00:00
Jim Jagielski
fa862b3f7e Allow compile time changes of field sizes and be more 
"clear" regarding the diff between balancer and worker slots...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206268 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 17:32:03 +00:00
Graham Leggett
4ee7eea4cf Introduce a per request version of the remote IP address, which can be 
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204968 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-22 13:10:39 +00:00
Jim Jagielski
f16552affe check return status 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204556 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 15:51:46 +00:00
Jim Jagielski
846dd30b32 Never used. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204553 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 15:51:40 +00:00
Stefan Fritsch
b56ba5a823 More ap_log_rerror() usage and axe some more AJP: prefixes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203878 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 22:02:27 +00:00
Stefan Fritsch
2bd6f96a1a Log fatal errors at level CRIT, not at some random level from DEBUG to EMERG 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203868 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 21:49:44 +00:00
Stefan Fritsch
8ec7f5c5bf great proxy logging cleanup: 
* remove "proxy:", "FCGI", etc. prefixes and pid which are now
    included in the error log format

  * propagate frontend request's logconfig to backend request
    
  * use ap_log_rerror where possible
    
  * remove obsolete APLOG_NOERRNO


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203859 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 21:41:09 +00:00
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