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

12 Feb, 2011 5 commits

mod_cache: When a bad Expires date is present, we need to behave as if · a5fa0904

Graham Leggett authored Feb 12, 2011

the Expires is in the past, not as if the Expires is missing. PR 16521.


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

a5fa0904

Log something nicer than "Internal error: pcfg_openfile() called · d5287868

Stefan Fritsch authored Feb 12, 2011

with NULL filename" if no password file is configured


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

d5287868

* docs/manual/mod/: Play language lawyer with the SSL_*_DN_*_n variable · 29f6bce4

Joe Orton authored Feb 12, 2011

  description.

PR: 45875


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

29f6bce4

mod_cache: We must ignore quoted-string values that appear in a · 1712366e

Graham Leggett authored Feb 12, 2011

Cache-Control header. PR 50199.


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

1712366e

revert r1026746: · 45f64181

Stefan Fritsch authored Feb 12, 2011

If an unknown Content-* header is received for a PUT request, we must not
ignore it but reply with 501 per RFC 2616 9.6.

PR: 42978

Vetoed by Roy T. Fielding:
http://mail-archives.apache.org/mod_mbox/httpd-dev/201102.mbox/%3C9A5A8B62-ED16-4BD3-97DA-8475026BB81D@gbiv.com%3E

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

45f64181

11 Feb, 2011 6 commits

Reinstate comment. · b30cb40b

Graham Leggett authored Feb 11, 2011


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

b30cb40b

mod_cache: Respect s-maxage as described by RFC2616 14.9.3, which must · 92aeb5c0

Graham Leggett authored Feb 11, 2011

take precedence if present. PR 35247.


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

92aeb5c0

* Play safe if the notes table does not contain an SSL_connect_rv key. · 47e57ab5
Ruediger Pluem authored Feb 11, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1069785 13f79535-47bb-0310-9956-ffa450edef68
```
47e57ab5

* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Fix possible · bfe6f47f

Joe Orton authored Feb 11, 2011

startup failure in cases where multiple vhosts share the same
"vhost-id" and private key file. The cached-key case would
previously cause an abrupt return from the function, which could
prevent processing of configured keypairs for other vhosts. There
is no apparent reason to check for a "cache hit" against cached keys
using *any* algorithm types; instead only check against a key with
the matching type.

Submitted by: Masahiro Matsuya <matsuya redhat.com>, jorton

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

bfe6f47f

* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Simplify to · 1074735e

Joe Orton authored Feb 11, 2011

  calculate hash index only once per loop iteration; no (intended)
  functional change.  Add comments and tweak a log message.

* modules/ssl/ssl_private.h: Add comments.


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

1074735e

* modules/ssl/ssl_private.h: Clarify comment on modssl_pk_server_t. · 01ea424f
Joe Orton authored Feb 11, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1069725 13f79535-47bb-0310-9956-ffa450edef68
```
01ea424f

10 Feb, 2011 1 commit

move function... · 8867f3d8

Jim Jagielski authored Feb 10, 2011

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

8867f3d8

09 Feb, 2011 6 commits

Updates. · 05aa223d

Lucien Gentis authored Feb 09, 2011


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

05aa223d

Ugg... unbalanced workers *do* need a mutex as well (good catch Rüdiger!) · d048a32d
Jim Jagielski authored Feb 09, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068879 13f79535-47bb-0310-9956-ffa450edef68
```
d048a32d

typo · 97d17394

Jim Jagielski authored Feb 09, 2011

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

97d17394

Squash error/warning about signed/unsigned comparison · 9c8529bc

Jim Jagielski authored Feb 09, 2011

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

9c8529bc

* 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

08 Feb, 2011 6 commits

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

07 Feb, 2011 6 commits

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

05 Feb, 2011 3 commits

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

04 Feb, 2011 7 commits

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