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

22 Dec, 2007 1 commit

Solve two ssl issues; always install both ab.exe and abs.exe · 47088545

William A. Rowe Jr authored Dec 22, 2007

because it's easier to move around ab.exe when that's all
someone needs (and this is precisely how the binary installer
works, too), and also kindly ignore missing openssl tree files
because TIMTOWTDI (although this one is preferred :)

Backport: r606382, r606383

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606384 13f79535-47bb-0310-9956-ffa450edef68

47088545

21 Dec, 2007 9 commits

Let the installer lead on the origin sourceroot conf path · c0523050

William A. Rowe Jr authored Dec 21, 2007

Backport: r606293

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606294 13f79535-47bb-0310-9956-ffa450edef68

c0523050

Quoting this made it worse on us, not easier. · 59125cf1

William A. Rowe Jr authored Dec 21, 2007

Resolve SSLMutex default on win32.

Backports: r606274

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606275 13f79535-47bb-0310-9956-ffa450edef68

59125cf1

Kill proxy\ dir, a horrible name with no corresponding example · 49a8ca36

William A. Rowe Jr authored Dec 21, 2007

Backports: r606265

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606266 13f79535-47bb-0310-9956-ffa450edef68

49a8ca36

The installer will now create a temp-extras directory · c8f1ad54

William A. Rowe Jr authored Dec 21, 2007

Backports: r606251

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606252 13f79535-47bb-0310-9956-ffa450edef68

c8f1ad54

However, we still won't want to load charset_lite by default · f3e69b49

William A. Rowe Jr authored Dec 21, 2007

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606173 13f79535-47bb-0310-9956-ffa450edef68

f3e69b49

Add charset lite missing from old config · 89ca9aab

William A. Rowe Jr authored Dec 21, 2007

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606171 13f79535-47bb-0310-9956-ffa450edef68

89ca9aab

Unplug win32 specific config, plug in build/installwinconf.awk · 2ae69de9

William A. Rowe Jr authored Dec 21, 2007

Backports: r606158

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606167 13f79535-47bb-0310-9956-ffa450edef68

2ae69de9

Prepare for win32 to share the common config file. · fff23e7d

William A. Rowe Jr authored Dec 21, 2007

Note the quotes for "logs/access_log" which let us
toggle this to access.log, while leaving the custom
log format specifier pretty_log alone.

Also, prefer the user specified port for example
ServerName directive.

Backports: r606135


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606166 13f79535-47bb-0310-9956-ffa450edef68

fff23e7d

Copy with module list changes for 2.2 v.s. 2.x trunk module names. · 6f86459d

William A. Rowe Jr authored Dec 21, 2007

Borrowing the msi installer script as a starting point, ensure
we use the same configuration rewrite engine for the msi and the
local build. Prepares us to share httpd.conf.in with all platforms.

Backport: r606136, 606156, 606157

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606164 13f79535-47bb-0310-9956-ffa450edef68

6f86459d

20 Dec, 2007 2 commits

Revert the senseless half of r605396, whitespace only change. · ce5dc9b9

William A. Rowe Jr authored Dec 20, 2007

Noted by Ruediger, thanks for this catch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606050 13f79535-47bb-0310-9956-ffa450edef68

ce5dc9b9

* Add a proposal · 51adbf49

Ruediger Pluem authored Dec 20, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606036 13f79535-47bb-0310-9956-ffa450edef68

51adbf49

19 Dec, 2007 3 commits

Catch up to APR 1.2.12, which politely names the static · e5fa8af1

William A. Rowe Jr authored Dec 19, 2007

library pdb's the same as their correponding .lib's.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605415 13f79535-47bb-0310-9956-ffa450edef68

e5fa8af1

When building to WinNT, CommandLineToArgvW must resolve. · a2484857

William A. Rowe Jr authored Dec 19, 2007

Backports r605397

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605399 13f79535-47bb-0310-9956-ffa450edef68

a2484857

Handle args appropriately for an apr app. · c84aa26b

William A. Rowe Jr authored Dec 19, 2007

Backports r605395

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605396 13f79535-47bb-0310-9956-ffa450edef68

c84aa26b

18 Dec, 2007 2 commits

Sort · ae98ccc5

William A. Rowe Jr authored Dec 18, 2007

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605336 13f79535-47bb-0310-9956-ffa450edef68

ae98ccc5

Two type mismatch fixes previously committed to trunk\ · 72997e78

William A. Rowe Jr authored Dec 18, 2007

and forgotten from backports

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605073 13f79535-47bb-0310-9956-ffa450edef68

72997e78

17 Dec, 2007 1 commit

Correct statements in OPENSSL-README when building the · 3e09a8e6

William A. Rowe Jr authored Dec 17, 2007

httpd+openssl binary.

Backport: r604940

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604944 13f79535-47bb-0310-9956-ffa450edef68

3e09a8e6

15 Dec, 2007 6 commits

update convmap · 8d3dbb95

Andre Malo authored Dec 15, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604504 13f79535-47bb-0310-9956-ffa450edef68

8d3dbb95

activate LastChangedRevision keyword substitution · 99bd8d50

Andre Malo authored Dec 15, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604501 13f79535-47bb-0310-9956-ffa450edef68

99bd8d50

Update transformations · dc552e31

Vincent Bray authored Dec 15, 2007

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604471 13f79535-47bb-0310-9956-ffa450edef68

dc552e31

'segement' typo and link to correct directive for lbmethod explanation · e87dad76
Vincent Bray authored Dec 15, 2007
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604470 13f79535-47bb-0310-9956-ffa450edef68
```
e87dad76

* Rebuild documentation. · a62ae02b

Ruediger Pluem authored Dec 15, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604404 13f79535-47bb-0310-9956-ffa450edef68

a62ae02b

* Correctly terminate string in SSL client certificate extensions · 38a231d9

Ruediger Pluem authored Dec 15, 2007

  parsing by ensuring that it always has a \0 at the end.

PR: PR 44073
Submitted by: yl <yl bee-ware.net>
Reviewed by: rpluem, jorton, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604403 13f79535-47bb-0310-9956-ffa450edef68

38a231d9

14 Dec, 2007 3 commits

simple mod_ssl fix (too bad about the pSTRNdup) · 7ea6099a

Jeff Trawick authored Dec 14, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604332 13f79535-47bb-0310-9956-ffa450edef68

7ea6099a

Merge r603346 from trunk: · 0c1ba14d

Jim Jagielski authored Dec 14, 2007

http_protocol: Escape request method in 405 error reporting.
This has no security impact since the browser cannot be tricked
into sending arbitrary method strings.

(words from jorton)

Submitted by: trawick
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604192 13f79535-47bb-0310-9956-ffa450edef68

0c1ba14d

Vote. · c96a7c2e

Joe Orton authored Dec 14, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604141 13f79535-47bb-0310-9956-ffa450edef68

c96a7c2e

13 Dec, 2007 4 commits

* Propose a backport. · 03a0b726

Ruediger Pluem authored Dec 13, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604012 13f79535-47bb-0310-9956-ffa450edef68

03a0b726

vote, promote · 596d83ee

Eric Covener authored Dec 13, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603963 13f79535-47bb-0310-9956-ffa450edef68

596d83ee

That would be good too · 99be4b9a

William A. Rowe Jr authored Dec 13, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603944 13f79535-47bb-0310-9956-ffa450edef68

99be4b9a

eventually · 0c935830

Jeff Trawick authored Dec 13, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603924 13f79535-47bb-0310-9956-ffa450edef68

0c935830

12 Dec, 2007 5 commits

Backport r602795: fix ajp buffer size. · c5e3b03e

Nick Kew authored Dec 12, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603736 13f79535-47bb-0310-9956-ffa450edef68

c5e3b03e

Backport r602735 and r602735 · 41525623

Nick Kew authored Dec 12, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603732 13f79535-47bb-0310-9956-ffa450edef68

41525623

Vote&promote · 6bc3ca4f

Nick Kew authored Dec 12, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603729 13f79535-47bb-0310-9956-ffa450edef68

6bc3ca4f

Fix CVE-2007-5000: · 39d3ff31

William A. Rowe Jr authored Dec 12, 2007

* modules/mappers/mod_imagemap.c (menu_header): Fix
  cross-site-scripting issue by escaping the URI, and ensure that a
  charset parameter is sent in the content-type to prevent
  autodetection by broken browsers.

Reported by: JPCERT

Backports: r603282
Submitted by: jorton
Reviewed by: rpluem, trawick, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603711 13f79535-47bb-0310-9956-ffa450edef68

39d3ff31

+1, promote · 5cc8676a

Jeff Trawick authored Dec 12, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603617 13f79535-47bb-0310-9956-ffa450edef68

5cc8676a

11 Dec, 2007 4 commits

* Cast a vote. · 137eb557

Ruediger Pluem authored Dec 11, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603362 13f79535-47bb-0310-9956-ffa450edef68

137eb557

Vote. · a6fd6d64

Joe Orton authored Dec 11, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603306 13f79535-47bb-0310-9956-ffa450edef68

a6fd6d64

Propose CVE-2007-5000 fix. · 8d8e3d02

Joe Orton authored Dec 11, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603305 13f79535-47bb-0310-9956-ffa450edef68

8d8e3d02

* Add two new proposals · 25e3ef53

Ruediger Pluem authored Dec 11, 2007


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603231 13f79535-47bb-0310-9956-ffa450edef68

25e3ef53