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

10 Nov, 2011 24 commits

fix issue with incorrect munging of the lua package path -- LuaPackagePath... · 6e200304

Brian McCallister authored Nov 10, 2011

fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working

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

6e200304

drop automake stuff · 0c9e9291

Philip M. Gollucci authored Nov 10, 2011

move apr-build-system build files over from apreq



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

0c9e9291

move build system files over from apr-build-system branch in apreq · 20a627e7
Philip M. Gollucci authored Nov 10, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200464 13f79535-47bb-0310-9956-ffa450edef68
```
20a627e7
relocate some files to match the apr-build-system apreq branch · 843f17b2
Philip M. Gollucci authored Nov 10, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200463 13f79535-47bb-0310-9956-ffa450edef68
```
843f17b2

import apreq include files · 2e7d4eb8

Philip M. Gollucci authored Nov 10, 2011

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

2e7d4eb8

import apache 2.x module portion of apreq · 1d73ae0f

Philip M. Gollucci authored Nov 10, 2011

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

1d73ae0f

Fix spelling · 5d1e1a4f

Paul Querna authored Nov 10, 2011

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

5d1e1a4f

drop tests and automake code for now · 2b059a5f

Philip M. Gollucci authored Nov 10, 2011

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

2b059a5f

relocate apreq/library as a srclib · 18114407

Philip M. Gollucci authored Nov 10, 2011

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

18114407

end-generation hook: Fix false notification of end-of-generation for · b157f5b5

Jeff Trawick authored Nov 10, 2011

temporary intervals with no active MPM children.


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

b157f5b5

expose r:trace1-8 · be17e981

Eric Covener authored Nov 10, 2011


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

be17e981

Remove unneeded memcpy. · 3c22417c

Paul Querna authored Nov 10, 2011

Spotted by: RÃ¼diger PlÃ¼m


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

3c22417c

Apply ap_server_root_relative to the path used for the ticket secrets file. · 7003dfa4

Paul Querna authored Nov 10, 2011

Suggested by: RÃ¼diger PlÃ¼m


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

7003dfa4

ap_check_cmd_context checks don't work on the block forms · 2e3d3542

Eric Covener authored Nov 10, 2011

of the lua directives.



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

2e3d3542

config generation # (reported by ap_state_query(AP_SQ_CONFIG_GEN): · fb9de45b

Jeff Trawick authored Nov 10, 2011

* start at 0 instead of 1
* don't increment until after pconf cleanups run, in case a 
  cleanup needs to check the related config generation


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

fb9de45b

revert accidental commit 1200129 · e117b2e0

Jeff Trawick authored Nov 10, 2011


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

e117b2e0

clean up unused ap_my_generation variable · 6768dcb3

Jeff Trawick authored Nov 10, 2011

  (presence is odd, since this variable as an API was supposedly removed
  long ago, and a similarly named static variable was removed in r1078286)


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

6768dcb3

clean up unused ap_my_generation variable · 4b5e39bf

Jeff Trawick authored Nov 10, 2011

  (presence is odd, since this variable as an API was supposedly removed
  long ago, and a similarly named static variable was removed in r1078286)


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

4b5e39bf

Remove work-sketch cruft that went nowhere before getting ifdefed out · 8ec456a2
Nick Kew authored Nov 10, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200072 13f79535-47bb-0310-9956-ffa450edef68
```
8ec456a2

proxy-html.conf needs to be included automatically · c3f8ad7a

Nick Kew authored Nov 10, 2011

if mod_proxy_html is loaded. Otherwise it's a big
gotcha when mod_proxy_html just does nothing at all!

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

c3f8ad7a

Fix selection of loaded modules on AIX because its grep doesn't understand \< and \> · b89aa4d2
Stefan Fritsch authored Nov 10, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200064 13f79535-47bb-0310-9956-ffa450edef68
```
b89aa4d2

mod_proxy_html: Add ProxyHTMLURLMap conditions to docs. · bbf7636f

Nick Kew authored Nov 10, 2011

Seems they got lost in the initial docs drop!


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

bbf7636f

Add default proxy-html.conf file (defines links to be rewritten · 11585d60

Nick Kew authored Nov 10, 2011

according to W3C HTML 4 and XHTML 1).


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

11585d60

mod_proxy_html: use ap_expr to evaluate conditional URLMaps · 03508164

Nick Kew authored Nov 10, 2011


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

03508164

09 Nov, 2011 16 commits

Found a bug in mpm_event, investigating · fdbc1398

Stefan Fritsch authored Nov 09, 2011


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

fdbc1398

Whitespace fixes for r1200040 · c5806c86

Paul Querna authored Nov 09, 2011

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

c5806c86

Add support for RFC 5077 TLS Session tickets. This adds two new directives: · 967d943b

Paul Querna authored Nov 09, 2011

* SSLTicketKeyFile: To store the private information for the encryption of the ticket.
* SSLTicketKeyDefault To set the default, otherwise the first listed token is used.  This enables key rotation across servers.


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

967d943b

since mod_ssl.h is now included, tell compiler where to find it · cd66061d
Gregg Lewis Smith authored Nov 09, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200037 13f79535-47bb-0310-9956-ffa450edef68
```
cd66061d

Fixed NetWare build. · f962ac75

Guenter Knauf authored Nov 09, 2011

Patch submitted by: normw gknw net.


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

f962ac75

Downgrade log message which is triggered when client disconnects · c0e0a038
Stefan Fritsch authored Nov 09, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200033 13f79535-47bb-0310-9956-ffa450edef68
```
c0e0a038

As per bug #43710, mention that SSLLog isn't available any more. Also · c8292dea

Richard Bowen authored Nov 09, 2011

remove several long-dead links from the intro paragraph.


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

c8292dea

Use random value instead of remote IP address in cookie value. This has the · 3057824e

Stefan Fritsch authored Nov 09, 2011

advantage that we don't leak internal IP addresses in reverse proxy setups.
Also, use hex to make the cookie shorter.

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

3057824e

update transformation · b2636706

Andre Malo authored Nov 09, 2011


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

b2636706

examples are block elements and cannot occur within <p> elements. · 237d28ba
Andre Malo authored Nov 09, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199948 13f79535-47bb-0310-9956-ffa450edef68
```
237d28ba

update transformation · 131bbcbd

Andre Malo authored Nov 09, 2011


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

131bbcbd

use non-'const char *' while building string to avoid warnings · e4c7cb71
Jeff Trawick authored Nov 09, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199611 13f79535-47bb-0310-9956-ffa450edef68
```
e4c7cb71
Fix per-request / per-conn logging, probably broken by r1041140 · ae3f4edb
Stefan Fritsch authored Nov 09, 2011
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199591 13f79535-47bb-0310-9956-ffa450edef68
```
ae3f4edb

rebuild xdoc · 12116a1a

Richard Bowen authored Nov 09, 2011


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

12116a1a

Further clarification to address bug #30021 · 8bb1c2fa

Richard Bowen authored Nov 09, 2011


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

8bb1c2fa

mod_authn_socache: tidy up r1199565. · 6ccf6e7d

Nick Kew authored Nov 09, 2011

And we don't need that separator in the namespacing string -
it's not for human consumption.

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

6ccf6e7d