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

301 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jim Jagielski
aac783bdf5 No longer depend on how fork() works when laying out segments... 
function pointers in shm are... nasty ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1072098 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-18 18:40:25 +00:00
Jim Jagielski
f863547c32 Expose this as part of the API. That way, other code/modules 
which want to overload mod_proxy's trans phase can use it to
handle ProxyPass as well, without requiring monkeying
with conf->aliases...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068400 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-08 13:59:36 +00:00
Jim Jagielski
55b9f8fba8 Here we go... we can now, via balancer-manager, add new 
workers to existing balancers. Still work to be done,
like error checking that we aren't trying to add more
than we can (right now, it fails, but it would be nice
to handle it nicer), disabling and *deleting* workers
we don't want anymore, the actual drain method, etc...
but this is some major goodness.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067269 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-04 20:01:04 +00:00
Jim Jagielski
b32f5a5a09 Oops.... we need to adjust sticky, which is an array now 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067205 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-04 16:11:12 +00:00
Jim Jagielski
57a654ffe7 Instead of just enabling/disabling, we can now adjust 
more useful worker status bits, such as whether hot stby, etc...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066482 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-02 14:39:48 +00:00
Jim Jagielski
f2c6805bc9 Again, abstract out the worker status magic to it's handled 
by funcs...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066138 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-01 19:07:02 +00:00
Jim Jagielski
6c0a4fc5da Move the setting of flags into a func... that way there is 
one place to maintain as the number of flags grow...

Since we are using just the bits, make unsigned.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066110 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-01 18:13:15 +00:00
Jim Jagielski
3866ae89a4 We can now change lbmethod at runtime. 
Provide a stub for other balancer-related params to
be adjusted as well, like timeout, sticky, etc...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066076 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-01 16:00:01 +00:00
Jim Jagielski
177e4e5f86 Move the lbmethod to also allow it to be adjusted runtime 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065750 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-31 20:29:01 +00:00
Jim Jagielski
7b07c3822e tuck away code that lets us ensure that the id is always 
"unique"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065749 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-31 20:28:57 +00:00
Jim Jagielski
12ae415dbe Move some "nice to be able to change" balancer stuff to shm 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065748 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-31 20:28:52 +00:00
Igor Galić
ceb1766d2d Add a patch from Vincent Deffontaines to make the adding of X-forwarded-* 
headers configurable: ProxyAddHeaders, defaulting to 'On'.
http://www.mail-archive.com/dev@httpd.apache.org/msg49971.html


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060795 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-19 12:48:17 +00:00
Rainer Jung
5e981d902a mod_slotmem_shm is a predecessor of 
mod_proxy_balancer, not mod_proxy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060109 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-17 22:09:18 +00:00
Jim Jagielski
31c4a9e21e Move nonce to balancer struct and add logic for nonce and growth. 
Adjust mmn and update doccos

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058629 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:59:22 +00:00
Jim Jagielski
ddebc67a4e whitespace 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058626 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:59:10 +00:00
Jim Jagielski
fab3678ad3 Builds and passes tests as prefork... good save state 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058625 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:59:05 +00:00
Jim Jagielski
9096c04779 Adjust for conf->workers being *proxy_worker and balancer->workers being **proxy_worker 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058624 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:59:02 +00:00
Jim Jagielski
201bbd1ba9 More movement to shared stuff... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058623 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:58:57 +00:00
Jim Jagielski
daa5a5c57c OK... a good commit point (we don't quite compile yet though...) 
Pull out the worker scoreboard cruft and start moving most
worker stuff to shm. Use slotmem for workers and provide
space for growth.

Redo logic:

  ap_proxy_define_*
  ap_proxy_create_*
  ap_proxy_initialize_*

Right now just for workers, but lay framework for balancers
as well. The idea is to break out the functional parts
to make it easy for dynamics. Defining is simply describing
the worker, and tucking that info away. When we create, we
go ahead and create the shared memory, etc... Initialize
is simply to allow child process to access the shm...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058622 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:58:50 +00:00
Jim Jagielski
5febbb22aa Use branch now 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058621 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:58:45 +00:00
Graham Leggett
d37c924b9d The alias_set variable is set when a parent location contains a ProxyPass, 
so this check catches valid ProxyPasses. Remove the check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1051628 13f79535-47bb-0310-9956-ffa450edef68
 2010-12-21 20:00:38 +00:00
Stefan Fritsch
39db8e5413 mod_proxy: Fix ProxyPassInterpolateEnv directive. 
PR: 50292


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1036602 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-18 20:15:24 +00:00
Nick Kew
3bad5b1780 Fix mod_proxy to support setting source address. 
PR 29404
Seems lots of users want this, and a couple of them have recenly asked nicely


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1034916 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-14 00:01:43 +00:00
Eric Covener
b73db43c7a PR47765: ProxyPass and ProxyPassReverse should not be accepted in 
Directory or Files sections.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031758 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-05 20:03:02 +00:00
Graham Leggett
13fec746f9 mod_proxy: Optimise ProxyPass within a Location so that it is stored 
per-directory, and chosen during the location walk. Make ProxyPass
work correctly from within a LocationMatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026184 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-22 00:13:45 +00:00
Graham Leggett
84a346c5bb mod_proxy: Move the ProxyErrorOverride directive to have per directory scope. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1025666 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-20 18:33:55 +00:00
Rainer Jung
8a73bd8002 Change behaviour of worker sharing. 
A proxy worker is shared, if its URL is a leading substring
of the URL of another worker defined later in the configuration.

Before this change this
- triggered the "worker ... already used by another worker" message
- resulted in a hard to understand configuration for this worker
  - Attributes explicitely given in the later worker overwrote
    attributes in the worker which was defined first
  - General proxy attributes (e.g. ProxyTimeout ) overwrote
    attributes in the worker which was defined first

New behaviour:
- Talk about "sharing" of workers and log both worker URLs
  in the info log message instead of the "already used" message
- Do not overwrite attributes. If attributes were explicitely
  given in the later worker, log a warning that those are ignored
  because of sharing.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987854 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-22 09:47:29 +00:00
Rainer Jung
d59332de14 Minor style nits. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987853 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-22 09:46:23 +00:00
Jeff Trawick
5a222cf2cf mod_proxy: Rename erroronstatus to failonstatus... 
... by popular demand, and add documentation.

Submitted by: Daniel Ruggeri <DRuggeri primary.net>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987359 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-20 00:54:34 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take 
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:59:50 +00:00
William A. Rowe Jr
380a1e9d08 Correct bogus code; stack alloc of variable length is not portable from C++. 
And look, there's an apr for that.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@931432 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-07 04:39:43 +00:00
Jeff Trawick
6f4c170986 small style tweaks to r930125 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930254 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-02 12:19:22 +00:00