Commits · 6d4054e57c4e851e599e5e98dcfbf8e9cba01860 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

Feb 09, 2011

* Fix syntax errors and a non existing variable. · 6d4054e5

Ruediger Pluem authored Feb 09, 2011

Submitted by: NormW <normw gknw.net>
Reviewed by: rpluem



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068784 13f79535-47bb-0310-9956-ffa450edef68

6d4054e5

* Make module compile by fixing some typos. · 9b4e26de

Ruediger Pluem authored Feb 09, 2011

PR: 50735
Submitted by: Mark Montague <mark catseye.org>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068778 13f79535-47bb-0310-9956-ffa450edef68

9b4e26de

Feb 08, 2011

RPM spec file: Make the httpd init script consistent with the htcacheclean · 6640024d

Graham Leggett authored Feb 08, 2011

init script. Multiple daemons can be started by creating symlinks to the
init script.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068660 13f79535-47bb-0310-9956-ffa450edef68

6640024d

Remove the thread mutex from the worker... it really should be · 3355d900

Jim Jagielski authored Feb 08, 2011

in the balancer. Thus we have global and thread for the balancer.
Use global when updating the full, shm list of workers; use
thread when being local.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068581 13f79535-47bb-0310-9956-ffa450edef68

3355d900

Expose this as part of the API. That way, other code/modules · c9eac71c

Jim Jagielski authored Feb 08, 2011

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

c9eac71c

* server/mpm/prefork/prefork.c (stop_listening, sig_term, restart): · 9ae1372e

Joe Orton authored Feb 08, 2011

  Update mpm_state in the signal handlers such that it is correct in
  children during a graceful stop/restart too.

PR: 41743
Submitted by: Andrew Punch <andrew.punch 247realmedia.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068389 13f79535-47bb-0310-9956-ffa450edef68

9ae1372e

Rebuild transformations. · 4f15a8da

Richard Bowen authored Feb 08, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068331 13f79535-47bb-0310-9956-ffa450edef68

4f15a8da

Custom, not Customer, error docs. · f4540843

Richard Bowen authored Feb 08, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068329 13f79535-47bb-0310-9956-ffa450edef68

f4540843

Feb 07, 2011

Only persist if we want it to · 792a23ef

Jim Jagielski authored Feb 07, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068072 13f79535-47bb-0310-9956-ffa450edef68

792a23ef

OK, use faster, shared version... makes sense to persist this · df19a77d

Jim Jagielski authored Feb 07, 2011

info since it is aligned with the actual data itself.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068066 13f79535-47bb-0310-9956-ffa450edef68

df19a77d

Keep track of how many workers we've used so far... no need · edd62f45

Jim Jagielski authored Feb 07, 2011

to provide field to add another if no slots exist.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068020 13f79535-47bb-0310-9956-ffa450edef68

edd62f45

Save this for later to be done... recall that .free needs to · 6827eeda

Jim Jagielski authored Feb 07, 2011

exist in shm...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068019 13f79535-47bb-0310-9956-ffa450edef68

6827eeda

Slotmem now provides for the number of "free" slots · b6d29b34

Jim Jagielski authored Feb 07, 2011

available.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068018 13f79535-47bb-0310-9956-ffa450edef68

b6d29b34

Mutex around adding a new worker... · c1826ce5

Jim Jagielski authored Feb 07, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067965 13f79535-47bb-0310-9956-ffa450edef68

c1826ce5

Feb 05, 2011

test_char.h is a dependency, not a source. This seems to fix the occasional · b7ba0c1b

Stefan Fritsch authored Feb 05, 2011

"No rule to make target `server/test_char.h'" errors when doing a parallel
build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067525 13f79535-47bb-0310-9956-ffa450edef68

b7ba0c1b

revert r1066944, r1067177 for now · 0fc9bb02

Stefan Fritsch authored Feb 05, 2011

breaks MacOS X and wherever this code will go, server/main.c does not seem to be the right place.
See
http://mail-archives.apache.org/mod_mbox/httpd-dev/201102.mbox/%3C01930193-8A3B-4635-9EB0-5EE31349E49C@jaguNET.com%3E

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067483 13f79535-47bb-0310-9956-ffa450edef68

0fc9bb02

Updates. · 920b83c1

Lucien Gentis authored Feb 05, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067467 13f79535-47bb-0310-9956-ffa450edef68

920b83c1

Feb 04, 2011

Lock around the time when we're mucking w/ balancers... · 5c2852cc

Jim Jagielski authored Feb 04, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067276 13f79535-47bb-0310-9956-ffa450edef68

5c2852cc

Here we go... we can now, via balancer-manager, add new · a625f12e

Jim Jagielski authored Feb 04, 2011

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

a625f12e

might as well allow for the sticky session to be adjusted as well... · 99017dbc
Jim Jagielski authored Feb 04, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067206 13f79535-47bb-0310-9956-ffa450edef68
```
99017dbc

Oops.... we need to adjust sticky, which is an array now · e148e287

Jim Jagielski authored Feb 04, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067205 13f79535-47bb-0310-9956-ffa450edef68

e148e287

update convmap · cc130650

Andre Malo authored Feb 04, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067189 13f79535-47bb-0310-9956-ffa450edef68

cc130650

And yet more balancer params that can be changed at runtime via · 08a245fb

Jim Jagielski authored Feb 04, 2011

the b-m application...

next up, of course, is adding new workers ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067178 13f79535-47bb-0310-9956-ffa450edef68

08a245fb

Until this is fixed to link in lresolv, exclude. · 3f67a3e2

Jim Jagielski authored Feb 04, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067177 13f79535-47bb-0310-9956-ffa450edef68

3f67a3e2

Feb 03, 2011

Reload resolv.conf on graceful restarts · 3f332313

Stefan Fritsch authored Feb 03, 2011

PR: 50619
Submitted by: Matt Miller <m miller f5 com>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066944 13f79535-47bb-0310-9956-ffa450edef68

3f332313

Optimize memory access pattern of ap_merge_per_dir_configs() · 5772498e

Stefan Fritsch authored Feb 03, 2011

According to Linux perf, this is twice as fast as the old loop.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066869 13f79535-47bb-0310-9956-ffa450edef68

5772498e

Raise DYNAMIC_MODULE_LIMIT to 256 · 8d2254ab

Stefan Fritsch authored Feb 03, 2011

discussed at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201006.mbox/%3C4C268563.30006@rowe-clan.net%3E

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066864 13f79535-47bb-0310-9956-ffa450edef68

8d2254ab

Feb 02, 2011

No need to pollute the whole namespace... · 218fe3f3

Jim Jagielski authored Feb 02, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066631 13f79535-47bb-0310-9956-ffa450edef68

218fe3f3

Status update · 4bb06b14

Igor Galić authored Feb 02, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066630 13f79535-47bb-0310-9956-ffa450edef68

4bb06b14

Optimize... create a struct to hold the worker status info · eb691f58

Jim Jagielski authored Feb 02, 2011

(need to align w/ set_params later on) and note when we
update timestamps

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066607 13f79535-47bb-0310-9956-ffa450edef68

eb691f58

update transformations · 8034d9d5

Igor Galić authored Feb 02, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066484 13f79535-47bb-0310-9956-ffa450edef68

8034d9d5

Instead of just enabling/disabling, we can now adjust · 61e6c155

Jim Jagielski authored Feb 02, 2011

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

61e6c155

DrBacchus sez fix-a-docs-bug · aaf05a59

Nick Kew authored Feb 02, 2011

PR 50396
Pedantry over description of qs-values.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066440 13f79535-47bb-0310-9956-ffa450edef68

aaf05a59

DrBacchus says Fix-a-docs-bug · de5d1ad5

Nick Kew authored Feb 02, 2011

PR 50396
Historical reasons for using IP-based virtualhosting no longer deserve
to be featured in our docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066434 13f79535-47bb-0310-9956-ffa450edef68

de5d1ad5

tid 50632, specifying the default of proxy-interim-response · 34f0a783

Igor Galić authored Feb 02, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066408 13f79535-47bb-0310-9956-ffa450edef68

34f0a783

Feb 01, 2011

Again, abstract out the worker status magic to it's handled · 3d30c665

Jim Jagielski authored Feb 01, 2011

by funcs...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066138 13f79535-47bb-0310-9956-ffa450edef68

3d30c665

bitfields should be unsigned · ebea0410

Jim Jagielski authored Feb 01, 2011

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1066112 13f79535-47bb-0310-9956-ffa450edef68

ebea0410

Move the setting of flags into a func... that way there is · 71c27f13

Jim Jagielski authored Feb 01, 2011

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

71c27f13

We can now change lbmethod at runtime. · 7ab70e02

Jim Jagielski authored Feb 01, 2011

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

7ab70e02

Jan 31, 2011

Forgot to encode accents in r1065768 · 27237395

Vincent Deffontaines authored Jan 31, 2011


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1065770 13f79535-47bb-0310-9956-ffa450edef68

27237395