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

Nov 18, 2011

r1203632 from trunk: · 57bbf64f

Jeff Trawick authored Nov 18, 2011

remove lingering reslist cruft


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

57bbf64f

merge r1203491 from trunk: · 59960cf6

Kaspar Brand authored Nov 18, 2011

drop SSLv2 support (set SSL_OP_NO_SSLv2 for any new SSL_CTX)


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

59960cf6

Nov 16, 2011

Backport r1202886: · 42424621

Stefan Fritsch authored Nov 16, 2011

Avoid one apr_time_now() call in the fast path


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

42424621

Nov 15, 2011

Add mod_data project ffile missing in r1202055 · 6d02da25

Gregg Lewis Smith authored Nov 15, 2011


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

6d02da25

Merge r1202456: · 075b02d0

Stefan Fritsch authored Nov 15, 2011

add new ldap features, make ap_expr entry more verbose


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

075b02d0

Fix xml · affbab5c

Stefan Fritsch authored Nov 15, 2011


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

affbab5c

Fix whitespace/style · 89243a4f

Gregg Lewis Smith authored Nov 15, 2011


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

89243a4f

Add mod_data to Windows build · 1dee9b27

Gregg Lewis Smith authored Nov 15, 2011


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

1dee9b27

Added another module load statement to NetWare config. · c850f7ed

Guenter Knauf authored Nov 15, 2011


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

c850f7ed

Added some module load statements to NetWare config. · 27f32b2f

Guenter Knauf authored Nov 15, 2011


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

27f32b2f

Fixed typo. · dca41eb1

Guenter Knauf authored Nov 15, 2011


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

dca41eb1

Added mod_data to NetWare build. · 2893b6f4

Guenter Knauf authored Nov 15, 2011


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

2893b6f4

Now that we're at 2.4.0 · d4113c19

Gregg Lewis Smith authored Nov 15, 2011


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

d4113c19

Nov 14, 2011

Fixed broken NWGNUmakefile introduced with r1201194, r1201195. · 025477ae

Guenter Knauf authored Nov 14, 2011


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

025477ae

Added comment to clarify for which module this directive is. · aad4c31f

Guenter Knauf authored Nov 14, 2011


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

aad4c31f

Merge r1201690 from trunk: · 6d73d1c0

Eric Covener authored Nov 14, 2011

followups on PR52175



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

6d73d1c0

update transformation · 31d7b074

Andre Malo authored Nov 14, 2011


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

31d7b074

Merge r1201571 from trunk: · 6a28c4d7

Eric Covener authored Nov 14, 2011

PR52175: RewriteBase is what applies to relative substitutions, not
the stripping of the per-directory prefix.

Reviewed by: covener

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

6a28c4d7

Nov 13, 2011

Whack the BOM · 8a387046

Sander Temme authored Nov 13, 2011

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

8a387046

update status · 7f262883

Jim Jagielski authored Nov 13, 2011

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

7f262883

Merge r1201455 from trunk: · 4c5dac62

Eric Covener authored Nov 13, 2011

clarify looping issue for PR52171.

-This line, and those below, will be ignored--

M    rewrite/tech.html.en
M    rewrite/tech.xml

Reviewed by: covener


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

4c5dac62

speling fix, from trunk r1201449 · 82362729

Jeff Trawick authored Nov 13, 2011


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

82362729

Merge r1201443 from trunk: · 79c054f8

Eric Covener authored Nov 13, 2011

add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections
behaves as expected instead of discarding previous sections.

Reviewed by: covener

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

79c054f8

Nov 12, 2011

Merge r1201354 from trunk: · 6fab7353

Jeff Trawick authored Nov 12, 2011

Server directive display (-L): Include directives of DSOs.


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

6fab7353

Update to reflect the fact that most of the listed blockers actually aren't · 4e51e52a
Stefan Fritsch authored Nov 12, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201355 13f79535-47bb-0310-9956-ffa450edef68
```
4e51e52a

Backport 1201331: · 5c9171f7

Graham Leggett authored Nov 12, 2011

mod_cache: Make sure we merge headers correctly when we handle a
non cacheable conditional response. PR52120.

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

5c9171f7

Fix if statement · a2a3a062

Stefan Fritsch authored Nov 12, 2011


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

a2a3a062

Set --enable-load-all-modules implicitely in · 62498547

Rainer Jung authored Nov 12, 2011

maintainer mode unless disabled explicitely.

Backport of r1201306 from trunk.

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

62498547

Revert r1201211 for the list of MPM queries: · fb218ba3

Rainer Jung authored Nov 12, 2011

Removing a query would be a major MMN change.


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

fb218ba3

Fix typo. · 992cfed0

Rainer Jung authored Nov 12, 2011


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

992cfed0

Pre GA removal of components that will not be included: · 8be83d09

Rainer Jung authored Nov 12, 2011

Part 3: Remote MPM simple.


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

8be83d09

Adopt STATUS to 2.4 branch. · 302086f5

Rainer Jung authored Nov 12, 2011


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

302086f5

Pre GA removal of components that will not be included: · 32421bdd

Rainer Jung authored Nov 12, 2011

Part 2: Remove the conditional mod_serf integration
from the event mpm.

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

32421bdd

Pre GA removal ob components that will not be included: · 4fd58375

Rainer Jung authored Nov 12, 2011

Part 2: Remove mod_serf.


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

4fd58375

Folloup on r1201161: New MaxMemFree was meant · 6a662ba0

Rainer Jung authored Nov 12, 2011

to be 2048, not 4096.

Backport of r1201202 from trunk.


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

6a662ba0

Move the examples README from experimental to · 556257a5

Rainer Jung authored Nov 12, 2011

examples. Correct some basic errors in the file.

No functional change.

Backport of r1201198 from trunk.


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

556257a5

No functional change: · d96b8ba9

Rainer Jung authored Nov 12, 2011

Choose consistent comments and remove explicit
module names, because those references easily
get outdated.

Backport of r1201194 from trunk.


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

d96b8ba9

Pre GA removal ob components that will not be included: · c08c916d

Rainer Jung authored Nov 12, 2011

Part 1: mod_noloris was superseded by mod_reqtimeout.


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

c08c916d

Choose consistent comments and remove explicit · fa2a7a52

Rainer Jung authored Nov 12, 2011

module names, because those references easily
get outdated.


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

fa2a7a52

Merge r1201158 from trunk: · 5b74cce1

Stefan Fritsch authored Nov 12, 2011

Set MaxMemFree 2048 by default


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

5b74cce1