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

Nov 13, 2011

As discussed at AC NA 2011 · a9230b22

Philip M. Gollucci authored Nov 13, 2011

o relocate srclib/libapreq/library/*.c -> server/apreq_${f}.c
o relocate srclib/libapreq/include/*.h -> include/*.h
o remove apreq_version.[hc] related stuff since its nolonger its own lib
o connect modules/apreq to the build under 'most' default comment out in httpd.conf
o update make_exports.awk to handle APREQ marcos

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

a9230b22

Nov 12, 2011

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

Jeff Trawick authored Nov 12, 2011


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

d0d5279d

mod_cache: Make sure we merge headers correctly when we handle a non · 4a9019d0

Graham Leggett authored Nov 12, 2011

cacheable conditional response. PR52120.


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

4a9019d0

Set --enable-load-all-modules implicitely in · 16cab945

Rainer Jung authored Nov 12, 2011

maintainer mode unless disabled explicitely.


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

16cab945

Folloup on r1201158: New MaxMemFree was meant · e6e95ab5

Rainer Jung authored Nov 12, 2011

to be 2048, not 4096.


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

e6e95ab5

Move the examples README from experimental to · bd6bec01

Rainer Jung authored Nov 12, 2011

examples. Correct some basic errors in the file.

No functional change.


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

bd6bec01

Choose consistent comments and remove explicit · a77ef2ed

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/trunk@1201194 13f79535-47bb-0310-9956-ffa450edef68

a77ef2ed

Set MaxMemFree 2048 by default · ea901094

Stefan Fritsch authored Nov 12, 2011


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

ea901094

Fix assertion failure during very high load by preventing race condition · 863723b1

Stefan Fritsch authored Nov 12, 2011

between appending to the timeout queues and adding to the pollset. We don't
add additional locking calls but only extend the present calls to include the
apr_pollset_add. Therefore this hopefully should not cause too much performance
regression.

Add some comments 

Replace two AP_DEBUG_ASSERTS with better error handling


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

863723b1

Change module sets and default activation status: · 8ca7800c

Rainer Jung authored Nov 12, 2011

1) Promoted from "most" to "few"

- mod_headers

2) Demoted from "yes" to "most"

- mod_actions
- mod_allowmethods
- mod_auth_form
- mod_buffer
- mod_cgi(d)
- mod_include
- mod_negotiation
- mod_ratelimit
- mod_request
- mod_userdir

Remember: default module set is "most",
but only the LoadModule lines of all
modules except "yes" are commented out by default.

The following modules will now be loaded by default:

- mod_access_compat
- mod_alias
- mod_auth_basic
- mod_authn_core
- mod_authn_file
- mod_authz_core
- mod_authz_groupfile
- mod_authz_host
- mod_authz_user
- mod_autoindex
- mod_dir
- mod_env
- mod_filter
- mod_headers
- mod_log_config
- mod_mime
- mod_mpm_event
- mod_reqtimeout
- mod_setenvif
- mod_status
- mod_unixd
- mod_version


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

8ca7800c

Nov 11, 2011

Use the right lua scope when used as a hook. · f7e3754a

Rainer Jung authored Nov 11, 2011


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

f7e3754a

Make doxygen generate (useful) graphs · cd1869a6

Igor Galić authored Nov 11, 2011

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

cd1869a6

Axes links to many grossly outdated resources. Adds more visible warning · be1b9997

Richard Bowen authored Nov 11, 2011

about the state of the developer documentstion.


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

be1b9997

replace most of the literal 2.2's with the major version entity · 62113bb8
Eric Covener authored Nov 11, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200984 13f79535-47bb-0310-9956-ffa450edef68
```
62113bb8

We're not 2.0 any more · f34b1c20

Richard Bowen authored Nov 11, 2011


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

f34b1c20

don't let thread-scope be selected in a server w/o threads · 62e619b8

Eric Covener authored Nov 11, 2011



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

62e619b8

C99 and unused variable warnings · 384f9dd9

Eric Covener authored Nov 11, 2011


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

384f9dd9

Rebuild doc transforms. · 017b8be5

Richard Bowen authored Nov 11, 2011


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

017b8be5

A little clarification about variable interpolation, as requested in bug #51125 · adba6243
Richard Bowen authored Nov 11, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200968 13f79535-47bb-0310-9956-ffa450edef68
```
adba6243

Rebuild doc transforms. · e51fee23

Richard Bowen authored Nov 11, 2011


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

e51fee23

Clarify docs for LimitRequestLine, as per bug #51665. · aafaf240

Richard Bowen authored Nov 11, 2011


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

aafaf240

Rebuild xdoc transform · d2151f2a

Richard Bowen authored Nov 11, 2011


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

d2151f2a

Patch from Luke Meyer, clarifies usage of ProxyPassReverseCookiePath directive. As per bug #51126 · ab57c5b3
Richard Bowen authored Nov 11, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200955 13f79535-47bb-0310-9956-ffa450edef68
```
ab57c5b3
A stab at libapreq build integration, still disabled by default. · ed7c2de3
Joe Orton authored Nov 11, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200715 13f79535-47bb-0310-9956-ffa450edef68
```
ed7c2de3

Formatting, no functional change. · 7186ccf3

Rainer Jung authored Nov 11, 2011


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

7186ccf3

Fix installation of conf/extra/proxy-html.conf. · 835ddc1d

Rainer Jung authored Nov 11, 2011

Otherwise httpd does no longer start, because
it is the only extra file required in the main
config at the moment.


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

835ddc1d

disable libapreq stuff until it works generically · 80b3f92a

Philip M. Gollucci authored Nov 11, 2011

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

80b3f92a

use a sub-pool for scope_once · 8b2c4e8e

Brian McCallister authored Nov 11, 2011

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

8b2c4e8e

replace server scope with thread scope · 52677ca6

Brian McCallister authored Nov 11, 2011

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

52677ca6

Nov 10, 2011

remove lingering reslist references before killing server scope · ad1b3c4e
Brian McCallister authored Nov 10, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200646 13f79535-47bb-0310-9956-ffa450edef68
```
ad1b3c4e
remove ability to set min and max pool sizes for server scope in prep for removing server scope · 8e0a1bbf
Brian McCallister authored Nov 10, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200639 13f79535-47bb-0310-9956-ffa450edef68
```
8e0a1bbf

remove some debug logging which snuck in · 64d6de1b

Brian McCallister authored Nov 10, 2011

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

64d6de1b

update xforms · cc318c85

Stefan Fritsch authored Nov 10, 2011


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

cc318c85

* buildconf: Pass through APR source dir to apreq's buildconf. · ad09bf4e

Joe Orton authored Nov 10, 2011


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

ad09bf4e

have libapreq install honor the top level layout options · 2dc82b98

Philip M. Gollucci authored Nov 10, 2011



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

2dc82b98

hook up srclib/libapreq to the build system · 3d44f677

Philip M. Gollucci authored Nov 10, 2011


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

3d44f677

* modules/lua/mod_lua.c (ap_lua_ssl_is_https): New function. · 30536dd8

Joe Orton authored Nov 10, 2011

  (lua_post_config): Pick up ssl_is_https optional function.

* modules/lua/lua_request.c (req_ssl_is_https_field): New function.
  (ap_lua_load_request): Map is_https field to above.


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

30536dd8

add Makefile.in for apreq · adbb8ad0

Philip M. Gollucci authored Nov 10, 2011

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

adbb8ad0

relocate the .h files to play nice with the srclib setup · c12d57de

Philip M. Gollucci authored Nov 10, 2011



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

c12d57de

* modules/filters/mod_proxy_html.c: Fix various code style issues. Use · 507b27bf

Joe Orton authored Nov 10, 2011

  apr_is* ctype macro wrappers.


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

507b27bf