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

Aug 25, 2011

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

Aug 24, 2011

* 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

Aug 23, 2011
- 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
Aug 22, 2011

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

Aug 21, 2011

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

Aug 20, 2011

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

Aug 15, 2011

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

Aug 14, 2011

· 704a5668

Eric Covener authored Aug 14, 2011

s/lderrno/uldap_ld_errno, but keep it internal.



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

704a5668

add a static method to retrieve the LDAP errno, and call from a · 5b950342

Eric Covener authored Aug 14, 2011

few other paths that have us returning LDAP_OTHER (since
only 'server down' is retryable, we want to work hard to get
it returned when appropriate)

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

5b950342

Enforce OpenSSL 0.9.7 or later at compile time (#error out otherwise). · 93dca33a

Kaspar Brand authored Aug 14, 2011

Remove some more unneeded defines from ssl_private.h.

At runtime, warn when mod_ssl is started with an OpenSSL version
older than the one it was originally compiled against.

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

93dca33a

Aug 13, 2011

Update auto-generated code · 5a9e4774

Stefan Fritsch authored Aug 13, 2011


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

5a9e4774

Do proper length checks in the expression scanner. This allows to remove the · 4f073e61

Stefan Fritsch authored Aug 13, 2011

8K length limit for expressions. Strings/Regexs in an expression are still
limited to 8K, though.

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

4f073e61

Actually commit the header added in r1157354 · 51ae2b8a

Stefan Fritsch authored Aug 13, 2011


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

51ae2b8a

Compare value instead of string pointer · 61cfb7d6

Stefan Fritsch authored Aug 13, 2011

Remove unused label
Remove unused var


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

61cfb7d6

Add ap_varbuf API for resizable buffers. · 63390a88

Stefan Fritsch authored Aug 13, 2011

Increase length limit of lines in the configuration file to 16MB.
Increase length limit of lines in the group file to 16MB.

PR: 45888, 50824, 43084

Windows and Netware build changes are untested.


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

63390a88

Aug 12, 2011

Accept LDAP_OPT_CONNECT_TIMEOUT as an alternative to LDAP_OPT_NETWORK_TIMEOUT. · 50bd09a9

Eric Covener authored Aug 12, 2011

An alternative on at least some IBM client libraries:

http://publib.boulder.ibm.com/infocenter/tivihelp/v2r1/topic/com.ibm.IBMDS.doc/progref281.htm#opttimeout

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

50bd09a9

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCryptoDevice): Fix · d7d0985c

Joe Orton authored Aug 12, 2011

  double-free (and segfault) with bad arg to SSLCryptoDevice.


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

d7d0985c