]>
granicus.if.org Git - apache/log
Guenter Knauf [Mon, 14 Nov 2011 21:39:19 +0000 (21:39 +0000)]
Added apreq to NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201918 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 14 Nov 2011 15:09:45 +0000 (15:09 +0000)]
Fixed broken NWGNUmakefile introduced with r1201194, r1201195.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201743 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 14 Nov 2011 14:38:54 +0000 (14:38 +0000)]
Added comment to clarify for which module this directive is.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201729 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Nov 2011 13:15:09 +0000 (13:15 +0000)]
followups on PR52175
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201690 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 14 Nov 2011 12:12:14 +0000 (12:12 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201675 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Nov 2011 01:58:02 +0000 (01:58 +0000)]
PR52175: RewriteBase is what applies to relative substitutions, not
the stripping of the per-directory prefix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201571 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Nov 2011 17:10:03 +0000 (17:10 +0000)]
add some todos from my apachecon notes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201460 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Nov 2011 16:55:55 +0000 (16:55 +0000)]
clarify looping issue for PR52171.
-This line, and those below, will be ignored--
M rewrite/tech.html.en
M rewrite/tech.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201455 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 13 Nov 2011 16:13:34 +0000 (16:13 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201450 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 13 Nov 2011 16:13:12 +0000 (16:13 +0000)]
speling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201449 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Nov 2011 15:48:06 +0000 (15:48 +0000)]
add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections
behaves as expected instead of discarding previous sections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201443 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 01:07:37 +0000 (01:07 +0000)]
set svn:ignores
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201382 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 00:21:45 +0000 (00:21 +0000)]
libapreq is not a bunch of C files now, no special configure magic required
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201374 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 00:21:15 +0000 (00:21 +0000)]
remove leftovers from initial libapreq import
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201373 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 00:20:32 +0000 (00:20 +0000)]
As discussed at AC NA 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
Jeff Trawick [Sat, 12 Nov 2011 23:42:45 +0000 (23:42 +0000)]
Server directive display (-L): Include directives of DSOs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201354 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 12 Nov 2011 21:24:47 +0000 (21:24 +0000)]
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/trunk@
1201331 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 19:13:44 +0000 (19:13 +0000)]
Set --enable-load-all-modules implicitely in
maintainer mode unless disabled explicitely.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201306 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 05:59:13 +0000 (05:59 +0000)]
Folloup on r1201158: New MaxMemFree was meant
to be 2048, not 4096.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201202 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 05:53:49 +0000 (05:53 +0000)]
Move the examples README from experimental to
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
Rainer Jung [Sat, 12 Nov 2011 05:40:43 +0000 (05:40 +0000)]
Choose consistent comments and remove explicit
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
Stefan Fritsch [Sat, 12 Nov 2011 01:54:50 +0000 (01:54 +0000)]
Set MaxMemFree 2048 by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201158 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 12 Nov 2011 01:32:56 +0000 (01:32 +0000)]
Fix assertion failure during very high load by preventing race condition
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
Rainer Jung [Sat, 12 Nov 2011 00:12:50 +0000 (00:12 +0000)]
Change module sets and default activation status:
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
Rainer Jung [Fri, 11 Nov 2011 20:22:08 +0000 (20:22 +0000)]
Use the right lua scope when used as a hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201042 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Fri, 11 Nov 2011 19:26:22 +0000 (19:26 +0000)]
Make doxygen generate (useful) graphs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201032 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 18:18:32 +0000 (18:18 +0000)]
Axes links to many grossly outdated resources. Adds more visible warning
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
Eric Covener [Fri, 11 Nov 2011 17:41:35 +0000 (17:41 +0000)]
replace most of the literal 2.2's with the major version entity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200984 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:30:56 +0000 (17:30 +0000)]
We're not 2.0 any more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200978 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 11 Nov 2011 17:30:18 +0000 (17:30 +0000)]
don't let thread-scope be selected in a server w/o threads
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200977 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 11 Nov 2011 17:27:06 +0000 (17:27 +0000)]
C99 and unused variable warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200975 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:19:02 +0000 (17:19 +0000)]
Rebuild doc transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200970 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:17:02 +0000 (17:17 +0000)]
A little clarification about variable interpolation, as requested in bug #51125
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200968 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:11:17 +0000 (17:11 +0000)]
Rebuild doc transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200963 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:09:28 +0000 (17:09 +0000)]
Clarify docs for LimitRequestLine, as per bug #51665.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200961 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:07:36 +0000 (17:07 +0000)]
Rebuild xdoc transform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200957 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:06:40 +0000 (17:06 +0000)]
Patch from Luke Meyer, clarifies usage of ProxyPassReverseCookiePath directive. As per bug #51126
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200955 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 11 Nov 2011 03:01:33 +0000 (03:01 +0000)]
A stab at libapreq build integration, still disabled by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200715 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 11 Nov 2011 02:40:16 +0000 (02:40 +0000)]
Formatting, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200702 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 11 Nov 2011 02:32:19 +0000 (02:32 +0000)]
Fix installation of conf/extra/proxy-html.conf.
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
Philip M. Gollucci [Fri, 11 Nov 2011 02:18:48 +0000 (02:18 +0000)]
disable libapreq stuff until it works generically
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200695 13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Fri, 11 Nov 2011 00:49:05 +0000 (00:49 +0000)]
use a sub-pool for scope_once
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200667 13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Fri, 11 Nov 2011 00:16:56 +0000 (00:16 +0000)]
replace server scope with thread scope
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200656 13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Thu, 10 Nov 2011 23:57:57 +0000 (23:57 +0000)]
remove lingering reslist references before killing server scope
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200646 13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Thu, 10 Nov 2011 23:54:00 +0000 (23:54 +0000)]
remove ability to set min and max pool sizes for server scope in prep for removing server scope
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200639 13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Thu, 10 Nov 2011 23:13:08 +0000 (23:13 +0000)]
remove some debug logging which snuck in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200614 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 10 Nov 2011 22:41:41 +0000 (22:41 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200609 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 10 Nov 2011 22:22:01 +0000 (22:22 +0000)]
* buildconf: Pass through APR source dir to apreq's buildconf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200600 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 10 Nov 2011 22:09:44 +0000 (22:09 +0000)]
have libapreq install honor the top level layout options
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200594 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 10 Nov 2011 21:59:07 +0000 (21:59 +0000)]
hook up srclib/libapreq to the build system
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200590 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 10 Nov 2011 21:45:27 +0000 (21:45 +0000)]
* modules/lua/mod_lua.c (ap_lua_ssl_is_https): New function.
(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
Philip M. Gollucci [Thu, 10 Nov 2011 21:39:00 +0000 (21:39 +0000)]
add Makefile.in for apreq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200575 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 10 Nov 2011 21:34:29 +0000 (21:34 +0000)]
relocate the .h files to play nice with the srclib setup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200570 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 10 Nov 2011 21:21:03 +0000 (21:21 +0000)]
* modules/filters/mod_proxy_html.c: Fix various code style issues. Use
apr_is* ctype macro wrappers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200556 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 10 Nov 2011 21:13:35 +0000 (21:13 +0000)]
Rebuilds quickreference docs to reflect removal of htaccess context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200552 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 10 Nov 2011 21:11:31 +0000 (21:11 +0000)]
* modules/proxy/mod_proxy_html.c (comp_urlmap): Fix const-ness warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200550 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 10 Nov 2011 20:07:07 +0000 (20:07 +0000)]
Rebuild luaquickhandler doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200515 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 10 Nov 2011 20:04:05 +0000 (20:04 +0000)]
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
Brian McCallister [Thu, 10 Nov 2011 20:02:07 +0000 (20:02 +0000)]
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
Rich Bowen [Thu, 10 Nov 2011 20:00:41 +0000 (20:00 +0000)]
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
Stefan Fritsch [Thu, 10 Nov 2011 19:36:25 +0000 (19:36 +0000)]
Document configure change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200496 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 10 Nov 2011 19:31:49 +0000 (19:31 +0000)]
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
Joe Orton [Thu, 10 Nov 2011 19:17:52 +0000 (19:17 +0000)]
* 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
Paul Querna [Thu, 10 Nov 2011 19:01:54 +0000 (19:01 +0000)]
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
Brian McCallister [Thu, 10 Nov 2011 18:48:50 +0000 (18:48 +0000)]
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
Philip M. Gollucci [Thu, 10 Nov 2011 18:27:10 +0000 (18:27 +0000)]
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
Philip M. Gollucci [Thu, 10 Nov 2011 18:25:14 +0000 (18:25 +0000)]
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
Philip M. Gollucci [Thu, 10 Nov 2011 18:22:29 +0000 (18:22 +0000)]
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
Philip M. Gollucci [Thu, 10 Nov 2011 18:08:04 +0000 (18:08 +0000)]
import apreq include files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200458 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 10 Nov 2011 18:07:07 +0000 (18:07 +0000)]
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
Paul Querna [Thu, 10 Nov 2011 18:05:47 +0000 (18:05 +0000)]
Fix spelling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200456 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 10 Nov 2011 18:05:46 +0000 (18:05 +0000)]
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
Philip M. Gollucci [Thu, 10 Nov 2011 18:04:56 +0000 (18:04 +0000)]
relocate apreq/library as a srclib
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200454 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 10 Nov 2011 17:46:57 +0000 (17:46 +0000)]
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
Eric Covener [Thu, 10 Nov 2011 17:10:17 +0000 (17:10 +0000)]
expose r:trace1-8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200432 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Thu, 10 Nov 2011 15:19:15 +0000 (15:19 +0000)]
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
Paul Querna [Thu, 10 Nov 2011 15:17:18 +0000 (15:17 +0000)]
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
Eric Covener [Thu, 10 Nov 2011 07:30:55 +0000 (07:30 +0000)]
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
Jeff Trawick [Thu, 10 Nov 2011 04:52:52 +0000 (04:52 +0000)]
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
Jeff Trawick [Thu, 10 Nov 2011 04:19:21 +0000 (04:19 +0000)]
revert accidental commit
1200129
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200140 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 10 Nov 2011 04:13:16 +0000 (04:13 +0000)]
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
Jeff Trawick [Thu, 10 Nov 2011 04:10:42 +0000 (04:10 +0000)]
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
Nick Kew [Thu, 10 Nov 2011 00:56:19 +0000 (00:56 +0000)]
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
Nick Kew [Thu, 10 Nov 2011 00:51:42 +0000 (00:51 +0000)]
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
Stefan Fritsch [Thu, 10 Nov 2011 00:41:20 +0000 (00:41 +0000)]
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
Nick Kew [Thu, 10 Nov 2011 00:40:00 +0000 (00:40 +0000)]
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
Nick Kew [Thu, 10 Nov 2011 00:23:30 +0000 (00:23 +0000)]
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
Nick Kew [Thu, 10 Nov 2011 00:07:54 +0000 (00:07 +0000)]
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
Stefan Fritsch [Wed, 9 Nov 2011 23:56:12 +0000 (23:56 +0000)]
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
Paul Querna [Wed, 9 Nov 2011 23:44:53 +0000 (23:44 +0000)]
Whitespace fixes for r1200040
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200045 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 9 Nov 2011 23:37:37 +0000 (23:37 +0000)]
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
Gregg Lewis Smith [Wed, 9 Nov 2011 23:29:45 +0000 (23:29 +0000)]
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
Guenter Knauf [Wed, 9 Nov 2011 23:21:13 +0000 (23:21 +0000)]
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
Stefan Fritsch [Wed, 9 Nov 2011 23:19:06 +0000 (23:19 +0000)]
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
Rich Bowen [Wed, 9 Nov 2011 22:13:13 +0000 (22:13 +0000)]
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
Stefan Fritsch [Wed, 9 Nov 2011 21:43:49 +0000 (21:43 +0000)]
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
André Malo [Wed, 9 Nov 2011 20:26:02 +0000 (20:26 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1199949 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 9 Nov 2011 20:23:46 +0000 (20:23 +0000)]
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
André Malo [Wed, 9 Nov 2011 20:19:14 +0000 (20:19 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1199945 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 9 Nov 2011 04:23:13 +0000 (04:23 +0000)]
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