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

02 Dec, 2011 7 commits

Fix segfault with Solaris LDAP SDK when enabling ldaps. · 27bdc1e7

Stefan Fritsch authored Dec 02, 2011

Enable SSL by passing secure=1 to apr_ldap_init instead of calling
apr_ldap_set_option(... APR_LDAP_OPT_TLS ...).

This change carefully avoids any change of behavior on non-Solaris LDAP SDKs.

PR: 42682

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

27bdc1e7

Clarify the crypto notice for mod_session_crypto. · 35cc2739

Graham Leggett authored Dec 02, 2011


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

35cc2739

Update the crypto notices for apr_crypto. apr_ssl is long gone. · 03c603b3
Graham Leggett authored Dec 02, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209499 13f79535-47bb-0310-9956-ffa450edef68
```
03c603b3

mod_session_crypto: Fix a pool lifetime problem when reading from · f917f627

Graham Leggett authored Dec 02, 2011

SessionCryptoPassphraseFile.


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

f917f627

Fix for additional cases of URL rewriting with ProxyPassMatch or · 318b8675

Joe Orton authored Dec 02, 2011

RewriteRule, where particular request-URIs could result in undesired
backend network exposure in some configurations. (CVE-2011-4317)

Thanks to Prutha Parikh from Qualys for reporting this issue.

* modules/proxy/mod_proxy.c (proxy_trans): Decline to handle the "*"
  request-URI.  Fail for cases where r->uri does not begin with a "/".

* modules/mappers/mod_rewrite.c (hook_uri2file): Likewise.


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

318b8675

* server/listen.c (open_listeners): Fix logic error caught by · f3d438af

Joe Orton authored Dec 02, 2011

Coverity; possible NULL pointer deref at startup with a
particular (and unlikely) listener/system config.

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

f3d438af

Bring Windows httpd.conf up to date with documented or required modules · 1ace2298
Gregg Lewis Smith authored Dec 02, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209330 13f79535-47bb-0310-9956-ffa450edef68
```
1ace2298

01 Dec, 2011 6 commits

Update transformation. · 546622eb

Graham Leggett authored Dec 01, 2011


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

546622eb

Changes to v2.4 APIs. · 284d9c61

Graham Leggett authored Dec 01, 2011


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

284d9c61

Update transformations. · 9165f3df

Graham Leggett authored Dec 01, 2011


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

9165f3df

mod_rewrite: Add the AllowNoSlash RewriteOption, which makes it possible · 9bd43aa7

Graham Leggett authored Dec 01, 2011

for RewriteRules to be placed in .htaccess files that match the directory
with no trailing slash. PR 48304.

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

9bd43aa7

Wish came true: CacheEnable works within LocationMatch, giving us mod_cache · 477aea6e

Graham Leggett authored Dec 01, 2011

regexes for no additional cost.


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

477aea6e

Use 2 sep hashing functions to account for collisions... · 1ef5eb7d

Jim Jagielski authored Dec 01, 2011

Safe enough

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

1ef5eb7d

30 Nov, 2011 9 commits

Remove some getpid() logging, this is now also included in the error log · b28ad81a
Stefan Fritsch authored Nov 30, 2011
```
format.


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

mod_cache: Apply the API change that allows future mod_cache providers to · f727be83

Graham Leggett authored Nov 30, 2011

invalidate cache entries, which will fix PR15868.


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

f727be83

Remove some more now redundant log prefixes · a73683b6

Stefan Fritsch authored Nov 30, 2011


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

a73683b6

Clarify the peer IP of the connection and the client IP of the request within · 8a8bd8a1
Graham Leggett authored Nov 30, 2011
```
the docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208753 13f79535-47bb-0310-9956-ffa450edef68
```
8a8bd8a1
RPM: Make it possible to build mod_socache_dc against distcache. · 5dd0b8de
Graham Leggett authored Nov 30, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208725 13f79535-47bb-0310-9956-ffa450edef68
```
5dd0b8de

Added missing proxy import to Netware build. · e739bfec

Guenter Knauf authored Nov 30, 2011


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

e739bfec

Fixed compilation for non-*nix platforms. · c6f9f1a9

Guenter Knauf authored Nov 30, 2011


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

c6f9f1a9

mod_session_crypto: Add a SessionCryptoPassphraseFile directive so that the · d191d95a

Graham Leggett authored Nov 30, 2011

administrator can hide the keys from the configuration.


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

d191d95a

use a style sheet... ideally we would pull one off the filesystem, · ed47b0f5

Jim Jagielski authored Nov 30, 2011

but for now...

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

ed47b0f5

29 Nov, 2011 16 commits

Remove more log message prefixes that are now redundant as the · f6183803

Stefan Fritsch authored Nov 29, 2011

the error log format includes the module name.


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

f6183803

mod_dbd: The dbd_prepared_init() function reported the result of the last · ac36b13c

Graham Leggett authored Nov 29, 2011

prepared statement, obscuring earlier errors. Fixed.


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

ac36b13c

Ensure casing doesn't matter... (we know balancer->s->name is · bb2ed8e2

Jim Jagielski authored Nov 29, 2011

lc)

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

bb2ed8e2

Some optimization... we have a hash, use it. Quicker than all · d2a743d4

Jim Jagielski authored Nov 29, 2011

these string comparisons.

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

d2a743d4

whitespace · 3f7c421c

Jim Jagielski authored Nov 29, 2011

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

3f7c421c

RPM: Add support for mod_lua. · 3244cf5a

Graham Leggett authored Nov 29, 2011


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

3244cf5a

RPM: Introduce a proper layout for RPM, removing the need for script · dd1a262d

Graham Leggett authored Nov 29, 2011

gymnastics and replacement configuration files in order to get the
configuration paths to match up correctly.

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

dd1a262d

Logic which makes the balancer "active" or not... so we can turn them · 421430f9

Jim Jagielski authored Nov 29, 2011

off and on as needed.

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

421430f9

RPM: Introduce an httpd-tools package, containing all the userland · bd7f8860

Graham Leggett authored Nov 29, 2011

support tools, aligned with Fedora's RPM.


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

bd7f8860

RPM: Align the requires and buildrequires lines with those of the Fedora · 2e62de18

Graham Leggett authored Nov 29, 2011

RPM in order to remove unnecessary dependencies.


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

2e62de18

Instead of running thru all kinds of logic paths, just add in · e9e3ebb5

Jim Jagielski authored Nov 29, 2011

a on/off bit... No need for other balancer statuses(sp)?

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

e9e3ebb5

RPM: Split the LDAP and proxy_html modules into dedicated RPMs, so that the · d62dc881

Graham Leggett authored Nov 29, 2011

httpd RPM doesn't depend on LDAP libraries or libxml2.


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

d62dc881

RPM: Remove stray configure options that are covered by · c9269418

Graham Leggett authored Nov 29, 2011

--enable-mods-shared=all.


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

c9269418

RPM: Support shared mpms with the event mpm as default. Remove all the · 9e17fcea

Graham Leggett authored Nov 29, 2011

legacy plumbing that supported the static mpm builds, reverting back to a
simple RPM spec file.

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

9e17fcea

RPM: Include configuration for mod_proxy_html. · e9dd0263

Graham Leggett authored Nov 29, 2011


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

e9dd0263

RPM: The default httpd mpm is now worker instead of prefork. · 2e7bcadb
Graham Leggett authored Nov 29, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1207719 13f79535-47bb-0310-9956-ffa450edef68
```
2e7bcadb

28 Nov, 2011 2 commits

Expose the path that the balancer handles... · 36331d4e

Jim Jagielski authored Nov 28, 2011

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

36331d4e

Pull this out as a sep function to allow for full vhosting · 4e45e051

Jim Jagielski authored Nov 28, 2011

adjustment between get and define balancers...

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

4e45e051