1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

22315 Commits

Author SHA1 Message Date
Paul Querna
548f0febab Remove AP_MODE_INIT, it is a no-op, everywhere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/input-filter-dev@1200612 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 22:55:06 +00:00
Paul Querna
e1935d046c Create branch for input filter design changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/input-filter-dev@1200549 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 21:07:48 +00:00
Rich Bowen
e3118b560d Rebuild luaquickhandler doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200515 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 20:07:07 +00:00
Rich Bowen
e625d65bf7 Make the contextlist agree with the comment in the doc itself.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200514 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 20:04:05 +00:00
Brian McCallister
5eb6753e25 remove last traces of the code cache
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200513 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 20:02:07 +00:00
Rich Bowen
1a71a61ba5 Rebuild Nick's change to mod_proxy_html doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200509 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 20:00:41 +00:00
Stefan Fritsch
933c83b03f Document configure change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200496 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:36:25 +00:00
Stefan Fritsch
f4a5d6641f Only load the really imporant modules (i.e. those enabled by the 'few'
selection) by default. Don't handle modules enabled with --enable-foo
specially.

This fixes problems with module dependencies until someone implements a
mechanism for resolving module dependencies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200491 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:31:49 +00:00
Joe Orton
de5161b3d9 * modules/ssl/ssl_private.h, modules/ssl/ssl_engine_kernel.c
(ssl_callback_tlsext_tickets): Use unsigned char * to fix gcc
  -Wpointer-sign warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200482 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:17:52 +00:00
Paul Querna
b8cb50f6ef Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200478 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:01:54 +00:00
Brian McCallister
1cedf45414 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
2011-11-10 18:48:50 +00:00
Philip M. Gollucci
1bdcf2c3f6 drop automake stuff
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
2011-11-10 18:27:10 +00:00
Philip M. Gollucci
9493bf62e4 move build system files over from apr-build-system branch in apreq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200464 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:25:14 +00:00
Philip M. Gollucci
972764a586 relocate some files to match the apr-build-system apreq branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200463 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:22:29 +00:00
Philip M. Gollucci
e9806ab9d9 import apreq include files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200458 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:08:04 +00:00
Philip M. Gollucci
008ccc8212 import apache 2.x module portion of apreq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200457 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:07:07 +00:00
Paul Querna
c37300112c Fix spelling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200456 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:05:47 +00:00
Philip M. Gollucci
9ba9dfc5ff drop tests and automake code for now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200455 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:05:46 +00:00
Philip M. Gollucci
c1902d9d28 relocate apreq/library as a srclib
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200454 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 18:04:56 +00:00
Jeff Trawick
5405226ae2 end-generation hook: Fix false notification of end-of-generation for
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
2011-11-10 17:46:57 +00:00
Eric Covener
e66f481ac3 expose r:trace1-8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200432 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 17:10:17 +00:00
Paul Querna
a195310515 Remove unneeded memcpy.
Spotted by: Rüdiger Plüm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200374 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 15:19:15 +00:00
Paul Querna
c44e61902f Apply ap_server_root_relative to the path used for the ticket secrets file.
Suggested by: Rüdiger Plüm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200372 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 15:17:18 +00:00
Eric Covener
2fb4d8c18f ap_check_cmd_context checks don't work on the block forms
of the lua directives.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200204 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 07:30:55 +00:00
Jeff Trawick
239e4c0466 config generation # (reported by ap_state_query(AP_SQ_CONFIG_GEN):
* 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
2011-11-10 04:52:52 +00:00
Jeff Trawick
00b4adb3b1 revert accidental commit 1200129
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200140 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 04:19:21 +00:00
Jeff Trawick
3c7b587593 clean up unused ap_my_generation variable
(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
2011-11-10 04:13:16 +00:00
Jeff Trawick
e4f5c7198e clean up unused ap_my_generation variable
(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
2011-11-10 04:10:42 +00:00
Nick Kew
10a47f58ae Remove work-sketch cruft that went nowhere before getting ifdefed out
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200072 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:56:19 +00:00
Nick Kew
6f00541520 proxy-html.conf needs to be included automatically
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
2011-11-10 00:51:42 +00:00
Stefan Fritsch
9209ff117f Fix selection of loaded modules on AIX because its grep doesn't understand \< and \>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200064 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:41:20 +00:00
Nick Kew
ff0b37a45b mod_proxy_html: Add ProxyHTMLURLMap conditions to docs.
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
2011-11-10 00:40:00 +00:00
Nick Kew
da6343c864 Add default proxy-html.conf file (defines links to be rewritten
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
2011-11-10 00:23:30 +00:00
Nick Kew
2cb0473a6e mod_proxy_html: use ap_expr to evaluate conditional URLMaps
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200055 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:07:54 +00:00
Stefan Fritsch
6b8849335f Found a bug in mpm_event, investigating
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200049 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 23:56:12 +00:00
Paul Querna
4935d31e45 Whitespace fixes for r1200040
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200045 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 23:44:53 +00:00
Paul Querna
8b2e0e56c2 Add support for RFC 5077 TLS Session tickets. This adds two new directives:
* 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
2011-11-09 23:37:37 +00:00
Gregg Lewis Smith
1bc9c909bb since mod_ssl.h is now included, tell compiler where to find it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200037 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 23:29:45 +00:00
Guenter Knauf
bfe80971d2 Fixed NetWare build.
Patch submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200035 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 23:21:13 +00:00
Stefan Fritsch
3095a74384 Downgrade log message which is triggered when client disconnects
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200033 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 23:19:06 +00:00
Rich Bowen
ee574da1bf As per bug #43710, mention that SSLLog isn't available any more. Also
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
2011-11-09 22:13:13 +00:00
Stefan Fritsch
29a8aa54bb Use random value instead of remote IP address in cookie value. This has the
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
2011-11-09 21:43:49 +00:00
André Malo
b7ca077a38 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199949 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 20:26:02 +00:00
André Malo
b568fa26be examples are block elements and cannot occur within <p> elements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199948 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 20:23:46 +00:00
André Malo
3db0ad2749 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199945 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 20:19:14 +00:00
Jeff Trawick
2553e327e3 use non-'const char *' while building string to avoid warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199611 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 04:23:13 +00:00
Stefan Fritsch
4a69a843de Fix per-request / per-conn logging, probably broken by r1041140
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199591 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 01:36:19 +00:00
Rich Bowen
4a7015ece5 rebuild xdoc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199569 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 00:38:10 +00:00
Rich Bowen
9c698e96a0 Further clarification to address bug #30021
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199568 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 00:34:39 +00:00
Nick Kew
6d78e38be1 mod_authn_socache: tidy up r1199565.
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
2011-11-09 00:32:49 +00:00