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

26 Aug, 2011 6 commits

Jim Jagielski authored Aug 26, 2011

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

8236257d

one off · 3a4171ff

Jim Jagielski authored Aug 26, 2011

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

3a4171ff

remove merge hit r1161778 · 234bb5c4

Jim Jagielski authored Aug 26, 2011

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

234bb5c4

More merge fixes... · f422e35e

Jim Jagielski authored Aug 26, 2011

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

f422e35e

Reset with latest · 1514e64b

Jim Jagielski authored Aug 26, 2011

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

1514e64b

* Don't SEGFAULT if SSLProxyMachineCertificateChainFile is not set. Just skip... · 4fe69a70

Ruediger Pluem authored Aug 26, 2011

* Don't SEGFAULT if SSLProxyMachineCertificateChainFile is not set. Just skip the additional lookups in this case.

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

4fe69a70

25 Aug, 2011 22 commits

Put parsed ranges into an array and perform merges on that array. · fc3b8852
Stefan Fritsch authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161791 13f79535-47bb-0310-9956-ffa450edef68
```
fc3b8852

count ranges by simply counting commas · b4201233

Stefan Fritsch authored Aug 25, 2011


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

b4201233

Remove the merging code from ap_set_byterange() again, · 389a0fb1

Stefan Fritsch authored Aug 25, 2011

will move it to ap_byterange_filter


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

389a0fb1

fix new breakage introduced by r1161767 · d52c6998

Stefan Fritsch authored Aug 25, 2011


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

d52c6998

avoid inserting the same bucket into bbout twice, causing an endless loop · a11b1463
Stefan Fritsch authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161767 13f79535-47bb-0310-9956-ffa450edef68
```
a11b1463

0 is OK · 62484cb8

Jim Jagielski authored Aug 25, 2011

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

62484cb8

no longer used · 30cbc29f

Greg Ames authored Aug 25, 2011


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

30cbc29f

Save a few cycles... do reason to set in_merge if we already have · 8f501285
Jim Jagielski authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161682 13f79535-47bb-0310-9956-ffa450edef68
```
8f501285

Optimize... and break if we get eg 200-100 · 8690cb10

Jim Jagielski authored Aug 25, 2011

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

8690cb10

Merge in byteranges · 931c384a

Jim Jagielski authored Aug 25, 2011

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

931c384a

* Once the comparsion is true we never return here since we break from the loop. · 380fbe27
Ruediger Pluem authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161582 13f79535-47bb-0310-9956-ffa450edef68
```
380fbe27

* We need to use > instead of >= as if end64 is the first byte of the next · da4eb161

Ruediger Pluem authored Aug 25, 2011

  bucket we need to memorize this one and not the one before.


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

da4eb161

* The first condition is not needed as pos >=0. If the first one is true · 812d4596

Ruediger Pluem authored Aug 25, 2011

the second one is true either. If the second one is false the first one is
false as well.

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

812d4596

* Adjust comment and don't get fooled by a negative end · 59095d75

Ruediger Pluem authored Aug 25, 2011

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

59095d75

* As reads might have morphed the bucket and its length read until we reached · 430d9ca0

Ruediger Pluem authored Aug 25, 2011

  the correct bucket for splitting.


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

430d9ca0

Remove some merging fun between Rüdiger and my patches ;) · 378bcdf5
Jim Jagielski authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161563 13f79535-47bb-0310-9956-ffa450edef68
```
378bcdf5

simple name change for clarity · 51703b53

Jim Jagielski authored Aug 25, 2011

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

51703b53

More casting help... · ea75efdf

Jim Jagielski authored Aug 25, 2011


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

ea75efdf

* Remove duplicate condition · ef8c0695

Ruediger Pluem authored Aug 25, 2011

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

ef8c0695

* Use apr_uint64_t throughout instead of mixing apr_off_t and apr_size_t · 588b8f8e
Ruediger Pluem authored Aug 25, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1161551 13f79535-47bb-0310-9956-ffa450edef68
```
588b8f8e

first round of cleanups · 9c3814ad

Jim Jagielski authored Aug 25, 2011

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

9c3814ad

Fold in Stefan's initial PoC for fixing memory issues with ranges · d9166565

Jim Jagielski authored Aug 25, 2011

by keeping orig brigade untouched and avoiding 1byte brigades
(related to CVE-2011-3192)

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

d9166565

24 Aug, 2011 3 commits

* Style fixes. No functional change. · 32a774a3

Ruediger Pluem authored Aug 24, 2011

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

32a774a3

* Add missing prototype · ba1f1052

Ruediger Pluem authored Aug 24, 2011

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

ba1f1052

* Add missing ; · efce31e6

Ruediger Pluem authored Aug 24, 2011

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

efce31e6

23 Aug, 2011 1 commit
- Add SSLProxyMachineCertificateChainFile directive and documentation for bug 50812 · 3c24faba
  Daniel Ruggeri authored Aug 23, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1160863 13f79535-47bb-0310-9956-ffa450edef68
```
  3c24faba
22 Aug, 2011 2 commits

Replaces rather weak example with a better one submitted by Marcus · 32556308

Richard Bowen authored Aug 22, 2011

Bointon (bug ID 51669)


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

32556308

Adds reference to --prefix argument in ServerRoot documentation, · fd1b1aee

Richard Bowen authored Aug 22, 2011

possibly addressing some confusion for bug ID 51352


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

fd1b1aee

21 Aug, 2011 1 commit

Updates. · c6503c7b

Lucien Gentis authored Aug 21, 2011


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

c6503c7b

20 Aug, 2011 1 commit

Simplify some overly complicated code using apr_brigade_putstrs and apr_pstrcat · 52a54885

Stefan Fritsch authored Aug 20, 2011

Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>,
Stefan Fritsch

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

52a54885

15 Aug, 2011 4 commits

mod_cache: Ensure that CacheDisable can correctly appear within · ac4a323d

Graham Leggett authored Aug 15, 2011

a LocationMatch.


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

ac4a323d

Adds TODO item so I won't forget. · fc927202

Richard Bowen authored Aug 15, 2011


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

fc927202

mod_cache: Fix the moving of the CACHE filter, which erroneously · 5ce23087

Graham Leggett authored Aug 15, 2011

stood down if the original filter was not added by configuration.


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

5ce23087

Improve ssl_log_cxerror(): · 633e1e4c

Kaspar Brand authored Aug 15, 2011

Fix logic of APLOG_IS_LEVEL check.
Use X509_NAME_print_ex() instead of deprecated X509_NAME_oneline().
Use i2a_ASN1_INTEGER for printing the serial number.
Add notBefore and notAfter dates to log line.
Check for null cert argument (addresses PR 47408).


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

633e1e4c