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
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
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
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
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
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
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
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
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
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
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
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
Nick Kew
565f842bd2
mod_authn_socache: fix namespacing issue
...
http://marc.info/?l=apache-httpd-dev&m=131823772714741&w=2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199565 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 00:28:51 +00:00
Stefan Fritsch
a3ffb7e3df
Remove some ap_add_version_component() calls that don't provide any information
...
because the modules don't have separate version numbers anymore
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199532 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 23:37:13 +00:00
Jeff Trawick
baa51e6a51
mod_dumpio: s/ap_log_error/ap_log_cerror/
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199520 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 23:07:30 +00:00
Stefan Fritsch
5f666a2385
mod_reqtimeout: Change the default to set some reasonable timeout values if loaded
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199447 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 20:41:47 +00:00
Stefan Fritsch
ebfb6ac9c9
Don't send a 500 if there is a timeout
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199444 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 20:36:03 +00:00
Rainer Jung
219333e4bf
Silence compiler warning about signedness differences.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199435 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 20:14:12 +00:00
Stefan Fritsch
296c6242a9
Fix up some length limit calculation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199410 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 19:41:05 +00:00
Stefan Fritsch
ccc76d4e43
Change default FileETag to be "size mtime", i.e. remove the inode. Adjust the
...
etag generation in mod_dav_fs to the new default.
PR 49623.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199086 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 03:06:08 +00:00
Stefan Fritsch
0697ff3e6a
Add some comments and another line length check
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199060 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 02:10:57 +00:00
Eric Covener
2af550c8c9
mod_lua: Expose SSL variables via r:ssl_var_lookup()
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199056 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 01:53:15 +00:00
Stefan Fritsch
bd5efb04fa
We still have to pass the dependency check to APACHE_MODULE to ensure
...
that mod_session_crypto is disabled with --enable-mods-shared=reallyall
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199046 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 01:34:58 +00:00
Eric Covener
d63996c35d
allow some lua hooks to be run in "early" or "late" mode
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199031 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 00:36:03 +00:00
Eric Covener
eaffe604d0
correct return val, the char* is pushed on the lua stack.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199028 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 00:25:47 +00:00
Rainer Jung
63a4102253
Solaris doesn't support "test -e" in combination
...
with "sh". We use "-f" in all other places.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199021 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 23:57:06 +00:00
Sander Temme
650b90f7f0
Link the modules that use it against the XML library so the server will start.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199019 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 23:55:27 +00:00
Stefan Fritsch
93819be068
Remove ProxyHTMLLogVerbose in favor of trace loglevels
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198995 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 23:07:12 +00:00
Jeff Trawick
3097e8585d
if mod_session_crypto prereq isn't available, don't bail if
...
the module was enabled implicitly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198989 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 22:59:51 +00:00
Stefan Fritsch
75c8dfdfdb
More error checking for ap_pregsub
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198988 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 22:58:52 +00:00
Jeff Trawick
2ea97b187b
auto var verbose not used
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198975 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 22:13:17 +00:00
Stefan Fritsch
ca96890328
More ap_pregsub error checking/logging
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198966 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 21:58:52 +00:00
Stefan Fritsch
1356548ce0
More checks of ap_pregsub return values
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198959 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 21:47:39 +00:00
Stefan Fritsch
646971c214
Check return value of ap_pregsub()
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198948 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 21:29:57 +00:00
Stefan Fritsch
b46ba1c36e
Also do length check if the last line is not LF terminated
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198926 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 20:53:12 +00:00
Eric Covener
629d9075cb
quick handlers and translate_name in lua can't be keyed off
...
Directory/Filename/htaccess
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197853 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 01:08:05 +00:00
Eric Covener
9143f29d2d
provide ap_escape_html as r:escape_html()
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197838 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 00:16:36 +00:00
Stefan Fritsch
509026bbee
re-add apr_pool_clear accidentally removed in r1197405
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197830 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 00:07:15 +00:00
Eric Covener
bb2c7989ea
get the hello world of Handlers working again
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197782 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 21:17:57 +00:00
Stefan Fritsch
6c57e61b1b
Unify syntax of config directives taking an expression as optional contition argument
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197413 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 07:27:07 +00:00
Stefan Fritsch
18e11cb4ff
To prevent overboarding memory usage, limit line length to 1MB
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197405 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 05:35:53 +00:00
Stefan Fritsch
30fb5f0a3e
Improve detection of libxml2
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196955 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 06:19:01 +00:00
Stefan Fritsch
8da8c26cd1
Modify placement of PROXY_DECLARE_DATA to fix build problems with MSVC,
...
reported by Gregg L. Smith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1196946 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 05:35:51 +00:00