]> granicus.if.org Git - apache/log
apache
12 years agor1203632 from trunk:
Jeff Trawick [Fri, 18 Nov 2011 13:30:55 +0000 (13:30 +0000)]
r1203632 from trunk:

remove lingering reslist cruft

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1203645 13f79535-47bb-0310-9956-ffa450edef68

12 years agomerge r1203491 from trunk:
Kaspar Brand [Fri, 18 Nov 2011 05:29:50 +0000 (05:29 +0000)]
merge r1203491 from trunk:

drop SSLv2 support (set SSL_OP_NO_SSLv2 for any new SSL_CTX)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1203495 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport r1202886:
Stefan Fritsch [Wed, 16 Nov 2011 21:10:19 +0000 (21:10 +0000)]
Backport r1202886:
Avoid one apr_time_now() call in the fast path

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202887 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd mod_data project ffile missing in r1202055
Gregg Lewis Smith [Tue, 15 Nov 2011 23:49:27 +0000 (23:49 +0000)]
Add mod_data project ffile missing in r1202055

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202477 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1202456:
Stefan Fritsch [Tue, 15 Nov 2011 23:00:46 +0000 (23:00 +0000)]
Merge r1202456:
add new ldap features, make ap_expr entry more verbose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202460 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFix xml
Stefan Fritsch [Tue, 15 Nov 2011 22:54:49 +0000 (22:54 +0000)]
Fix xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202458 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFix whitespace/style
Gregg Lewis Smith [Tue, 15 Nov 2011 18:37:26 +0000 (18:37 +0000)]
Fix whitespace/style

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202366 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd mod_data to Windows build
Gregg Lewis Smith [Tue, 15 Nov 2011 06:20:59 +0000 (06:20 +0000)]
Add mod_data to Windows build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1202055 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdded another module load statement to NetWare config.
Guenter Knauf [Tue, 15 Nov 2011 01:27:27 +0000 (01:27 +0000)]
Added another module load statement to NetWare config.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201995 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdded some module load statements to NetWare config.
Guenter Knauf [Tue, 15 Nov 2011 01:12:59 +0000 (01:12 +0000)]
Added some module load statements to NetWare config.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201990 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFixed typo.
Guenter Knauf [Tue, 15 Nov 2011 00:47:34 +0000 (00:47 +0000)]
Fixed typo.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201985 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdded mod_data to NetWare build.
Guenter Knauf [Tue, 15 Nov 2011 00:27:50 +0000 (00:27 +0000)]
Added mod_data to NetWare build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201977 13f79535-47bb-0310-9956-ffa450edef68

12 years agoNow that we're at 2.4.0
Gregg Lewis Smith [Tue, 15 Nov 2011 00:07:56 +0000 (00:07 +0000)]
Now that we're at 2.4.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201972 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFixed broken NWGNUmakefile introduced with r1201194, r1201195.
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/branches/2.4.x@1201743 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdded comment to clarify for which module this directive is.
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/branches/2.4.x@1201729 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1201690 from trunk:
Eric Covener [Mon, 14 Nov 2011 13:16:11 +0000 (13:16 +0000)]
Merge r1201690 from trunk:

followups on PR52175

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201691 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate transformation
André Malo [Mon, 14 Nov 2011 12:09:00 +0000 (12:09 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201673 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1201571 from trunk:
Eric Covener [Mon, 14 Nov 2011 01:58:59 +0000 (01:58 +0000)]
Merge r1201571 from trunk:

PR52175: RewriteBase is what applies to relative substitutions, not
the stripping of the per-directory prefix.

Reviewed by: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201572 13f79535-47bb-0310-9956-ffa450edef68

12 years agoWhack the BOM
Sander Temme [Sun, 13 Nov 2011 18:20:23 +0000 (18:20 +0000)]
Whack the BOM

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201468 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate status
Jim Jagielski [Sun, 13 Nov 2011 17:53:58 +0000 (17:53 +0000)]
update status

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201466 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1201455 from trunk:
Eric Covener [Sun, 13 Nov 2011 16:56:46 +0000 (16:56 +0000)]
Merge r1201455 from trunk:

clarify looping issue for PR52171.

-This line, and those below, will be ignored--

M    rewrite/tech.html.en
M    rewrite/tech.xml

Reviewed by: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201456 13f79535-47bb-0310-9956-ffa450edef68

12 years agospeling fix, from trunk r1201449
Jeff Trawick [Sun, 13 Nov 2011 16:13:56 +0000 (16:13 +0000)]
speling fix, from trunk r1201449

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201451 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1201443 from trunk:
Eric Covener [Sun, 13 Nov 2011 15:56:20 +0000 (15:56 +0000)]
Merge r1201443 from trunk:

add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections
behaves as expected instead of discarding previous sections.

Reviewed by: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201445 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1201354 from trunk:
Jeff Trawick [Sat, 12 Nov 2011 23:52:14 +0000 (23:52 +0000)]
Merge r1201354 from trunk:

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201358 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate to reflect the fact that most of the listed blockers actually aren't
Stefan Fritsch [Sat, 12 Nov 2011 23:43:36 +0000 (23:43 +0000)]
Update to reflect the fact that most of the listed blockers actually aren't

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201355 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport 1201331:
Graham Leggett [Sat, 12 Nov 2011 21:34:40 +0000 (21:34 +0000)]
Backport 1201331:
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/branches/2.4.x@1201332 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFix if statement
Stefan Fritsch [Sat, 12 Nov 2011 20:13:41 +0000 (20:13 +0000)]
Fix if statement

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201317 13f79535-47bb-0310-9956-ffa450edef68

12 years agoSet --enable-load-all-modules implicitely in
Rainer Jung [Sat, 12 Nov 2011 19:16:36 +0000 (19:16 +0000)]
Set --enable-load-all-modules implicitely in
maintainer mode unless disabled explicitely.

Backport of r1201306 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201307 13f79535-47bb-0310-9956-ffa450edef68

12 years agoRevert r1201211 for the list of MPM queries:
Rainer Jung [Sat, 12 Nov 2011 19:11:02 +0000 (19:11 +0000)]
Revert r1201211 for the list of MPM queries:
Removing a query would be a major MMN change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201304 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFix typo.
Rainer Jung [Sat, 12 Nov 2011 07:20:31 +0000 (07:20 +0000)]
Fix typo.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201216 13f79535-47bb-0310-9956-ffa450edef68

12 years agoPre GA removal of components that will not be included:
Rainer Jung [Sat, 12 Nov 2011 07:15:45 +0000 (07:15 +0000)]
Pre GA removal of components that will not be included:
Part 3: Remote MPM simple.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201214 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdopt STATUS to 2.4 branch.
Rainer Jung [Sat, 12 Nov 2011 06:44:12 +0000 (06:44 +0000)]
Adopt STATUS to 2.4 branch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201212 13f79535-47bb-0310-9956-ffa450edef68

12 years agoPre GA removal of components that will not be included:
Rainer Jung [Sat, 12 Nov 2011 06:39:51 +0000 (06:39 +0000)]
Pre GA removal of components that will not be included:
Part 2: Remove the conditional mod_serf integration
from the event mpm.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201211 13f79535-47bb-0310-9956-ffa450edef68

12 years agoPre GA removal ob components that will not be included:
Rainer Jung [Sat, 12 Nov 2011 06:35:58 +0000 (06:35 +0000)]
Pre GA removal ob components that will not be included:
Part 2: Remove mod_serf.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201210 13f79535-47bb-0310-9956-ffa450edef68

12 years agoFolloup on r1201161: New MaxMemFree was meant
Rainer Jung [Sat, 12 Nov 2011 06:00:57 +0000 (06:00 +0000)]
Folloup on r1201161: New MaxMemFree was meant
to be 2048, not 4096.

Backport of r1201202 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201203 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMove the examples README from experimental to
Rainer Jung [Sat, 12 Nov 2011 05:57:34 +0000 (05:57 +0000)]
Move the examples README from experimental to
examples. Correct some basic errors in the file.

No functional change.

Backport of r1201198 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201199 13f79535-47bb-0310-9956-ffa450edef68

12 years agoNo functional change:
Rainer Jung [Sat, 12 Nov 2011 05:44:53 +0000 (05:44 +0000)]
No functional change:
Choose consistent comments and remove explicit
module names, because those references easily
get outdated.

Backport of r1201194 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201195 13f79535-47bb-0310-9956-ffa450edef68

12 years agoPre GA removal ob components that will not be included:
Rainer Jung [Sat, 12 Nov 2011 02:10:43 +0000 (02:10 +0000)]
Pre GA removal ob components that will not be included:
Part 1: mod_noloris was superseded by mod_reqtimeout.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201164 13f79535-47bb-0310-9956-ffa450edef68

12 years agoChoose consistent comments and remove explicit
Rainer Jung [Sat, 12 Nov 2011 02:08:53 +0000 (02:08 +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/branches/2.4.x@1201163 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1201158 from trunk:
Stefan Fritsch [Sat, 12 Nov 2011 01:57:26 +0000 (01:57 +0000)]
Merge r1201158 from trunk:

Set MaxMemFree 2048 by default

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201161 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1201146 from trunk:
Stefan Fritsch [Sat, 12 Nov 2011 01:36:11 +0000 (01:36 +0000)]
Merge r1201146 from trunk:

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/branches/2.4.x@1201149 13f79535-47bb-0310-9956-ffa450edef68

12 years agoChange module sets and default activation status:
Rainer Jung [Sat, 12 Nov 2011 00:21:04 +0000 (00:21 +0000)]
Change module sets and default activation status:

1) Promoted from "most" to "yes/few"

- mod_headers

2) Demoted from "yes/few" 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/few" 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

Backport of r1201111 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201118 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate transformation
André Malo [Fri, 11 Nov 2011 22:23:04 +0000 (22:23 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201077 13f79535-47bb-0310-9956-ffa450edef68

12 years agoxforms to pick up new version string
Eric Covener [Fri, 11 Nov 2011 21:11:19 +0000 (21:11 +0000)]
xforms to pick up new version string

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201051 13f79535-47bb-0310-9956-ffa450edef68

12 years agobump to 2.4.0-dev and 2.4.0 in version.ent
Eric Covener [Fri, 11 Nov 2011 21:04:23 +0000 (21:04 +0000)]
bump to 2.4.0-dev and 2.4.0 in version.ent

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201048 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUse the right lua scope when used as a hook.
Rainer Jung [Fri, 11 Nov 2011 20:51:32 +0000 (20:51 +0000)]
Use the right lua scope when used as a hook.

Backport of r1201042 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201046 13f79535-47bb-0310-9956-ffa450edef68

12 years agoRebuild developer docs - remove outdated stuff and add warning about the state of...
Rich Bowen [Fri, 11 Nov 2011 18:27:37 +0000 (18:27 +0000)]
Rebuild developer docs - remove outdated stuff and add warning about the state of the developer docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201014 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAxe outdated resources, broken links, in developer docs.
Rich Bowen [Fri, 11 Nov 2011 18:21:07 +0000 (18:21 +0000)]
Axe outdated resources, broken links, in developer docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201011 13f79535-47bb-0310-9956-ffa450edef68

12 years agocash in on the version entities from r1200984 in 2.4 tree
Eric Covener [Fri, 11 Nov 2011 17:48:15 +0000 (17:48 +0000)]
cash in on the version entities from r1200984 in 2.4 tree

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200993 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1200977 from trunk:
Jim Jagielski [Fri, 11 Nov 2011 17:38:11 +0000 (17:38 +0000)]
Merge r1200977 from trunk:

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

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200983 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1200975 from trunk:
Jim Jagielski [Fri, 11 Nov 2011 17:37:26 +0000 (17:37 +0000)]
Merge r1200975 from trunk:

C99 and unused variable warnings

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200982 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580, r1200605...
Jim Jagielski [Fri, 11 Nov 2011 17:36:46 +0000 (17:36 +0000)]
Merge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580, r1200605, r1200612, r1200614, r1200639, r1200646, r1200656, r1200667, r1200679, r1200699, r1200957, r1200961, r1200963 from trunk:

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

Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me.

* modules/ssl/ssl_private.h, modules/ssl/ssl_engine_kernel.c
  (ssl_callback_tlsext_tickets): Use unsigned char * to fix gcc
  -Wpointer-sign warnings.

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.

remove last traces of the code cache

* modules/proxy/mod_proxy_html.c (comp_urlmap): Fix const-ness warning.

* 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.

remove some debug logging which snuck in

remove ability to set min and max pool sizes for server scope in prep for removing server scope

remove lingering reslist references before killing server scope

replace server scope with thread scope

use a sub-pool for scope_once

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.

Rebuild xdoc transform

Clarify docs for LimitRequestLine, as per bug #51665.

Rebuild doc transforms.

Submitted by: brianm, pquerna, jorton, sf, brianm, jorton, jorton, sf, pquerna, brianm, brianm, brianm, brianm, brianm, jorton, rjung, rbowen, rbowen, rbowen
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200981 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1200699 from trunk:
Jim Jagielski [Fri, 11 Nov 2011 17:25:11 +0000 (17:25 +0000)]
Merge r1200699 from trunk:

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.

Submitted by: rjung
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200973 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1200456 from trunk:
Jim Jagielski [Fri, 11 Nov 2011 17:22:19 +0000 (17:22 +0000)]
Merge r1200456 from trunk:

Fix spelling
Submitted by: pquerna
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200972 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBranch the 2.4.x "real" branch from r1200449 of trunk and before apreq
Jim Jagielski [Fri, 11 Nov 2011 17:12:57 +0000 (17:12 +0000)]
Branch the 2.4.x "real" branch from r1200449 of trunk and before apreq

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200966 13f79535-47bb-0310-9956-ffa450edef68

12 years agoend-generation hook: Fix false notification of end-of-generation for
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

12 years agoexpose r:trace1-8
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

12 years agoRemove unneeded memcpy.
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

12 years agoApply ap_server_root_relative to the path used for the ticket secrets file.
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

12 years agoap_check_cmd_context checks don't work on the block forms
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

12 years agoconfig generation # (reported by ap_state_query(AP_SQ_CONFIG_GEN):
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

12 years agorevert accidental commit 1200129
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

12 years agoclean up unused ap_my_generation variable
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

12 years agoclean up unused ap_my_generation variable
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

12 years agoRemove work-sketch cruft that went nowhere before getting ifdefed out
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

12 years agoproxy-html.conf needs to be included automatically
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

12 years agoFix selection of loaded modules on AIX because its grep doesn't understand \< and \>
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

12 years agomod_proxy_html: Add ProxyHTMLURLMap conditions to docs.
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

12 years agoAdd default proxy-html.conf file (defines links to be rewritten
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

12 years agomod_proxy_html: use ap_expr to evaluate conditional URLMaps
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

12 years agoFound a bug in mpm_event, investigating
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

12 years agoWhitespace fixes for r1200040
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

12 years agoAdd support for RFC 5077 TLS Session tickets. This adds two new directives:
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

12 years agosince mod_ssl.h is now included, tell compiler where to find it
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

12 years agoFixed NetWare build.
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

12 years agoDowngrade log message which is triggered when client disconnects
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

12 years agoAs per bug #43710, mention that SSLLog isn't available any more. Also
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

12 years agoUse random value instead of remote IP address in cookie value. This has the
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

12 years agoupdate transformation
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

12 years agoexamples are block elements and cannot occur within <p> elements.
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

12 years agoupdate transformation
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

12 years agouse non-'const char *' while building string to avoid warnings
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

12 years agoFix per-request / per-conn logging, probably broken by r1041140
Stefan Fritsch [Wed, 9 Nov 2011 01:36:19 +0000 (01:36 +0000)]
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

12 years agorebuild xdoc
Rich Bowen [Wed, 9 Nov 2011 00:38:10 +0000 (00:38 +0000)]
rebuild xdoc

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

12 years agoFurther clarification to address bug #30021
Rich Bowen [Wed, 9 Nov 2011 00:34:39 +0000 (00:34 +0000)]
Further clarification to address bug #30021

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

12 years agomod_authn_socache: tidy up r1199565.
Nick Kew [Wed, 9 Nov 2011 00:32:49 +0000 (00:32 +0000)]
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

12 years agomod_authn_socache: fix namespacing issue
Nick Kew [Wed, 9 Nov 2011 00:28:51 +0000 (00:28 +0000)]
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

12 years agoApplies patch provided by Luke Meyer in https://issues.apache.org/bugzilla/show_bug...
Rich Bowen [Wed, 9 Nov 2011 00:00:20 +0000 (00:00 +0000)]
Applies patch provided by Luke Meyer in https://issues.apache.org/bugzilla/show_bug.cgi?id=51131 - Adds usage example to mod_proxy_ajp docs.

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

12 years agoUpdate transformations.
Rainer Jung [Tue, 8 Nov 2011 23:46:40 +0000 (23:46 +0000)]
Update transformations.

Sorry for the noise, blame it to the
simplified chinese cleanup.

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

12 years agoRemove some ap_add_version_component() calls that don't provide any information
Stefan Fritsch [Tue, 8 Nov 2011 23:37:13 +0000 (23:37 +0000)]
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

12 years agofix typo
Stefan Fritsch [Tue, 8 Nov 2011 23:27:52 +0000 (23:27 +0000)]
fix typo

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

12 years agomod_dumpio: s/ap_log_error/ap_log_cerror/
Jeff Trawick [Tue, 8 Nov 2011 23:07:30 +0000 (23:07 +0000)]
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

12 years agoAnd we are at 2.3.16-dev
Jim Jagielski [Tue, 8 Nov 2011 23:07:29 +0000 (23:07 +0000)]
And we are at 2.3.16-dev

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

12 years agoGetting ready to tag 2.3.15-dev
Jim Jagielski [Tue, 8 Nov 2011 23:05:46 +0000 (23:05 +0000)]
Getting ready to tag 2.3.15-dev

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

12 years agoUpdate docs for default TimeOut value for
Rainer Jung [Tue, 8 Nov 2011 22:58:14 +0000 (22:58 +0000)]
Update docs for default TimeOut value for
other languages.

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

12 years agoUpdate transformations.
Rainer Jung [Tue, 8 Nov 2011 22:53:44 +0000 (22:53 +0000)]
Update transformations.

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

12 years agoFix invalid XHTML: duplicate id "apr".
Rainer Jung [Tue, 8 Nov 2011 22:28:40 +0000 (22:28 +0000)]
Fix invalid XHTML: duplicate id "apr".

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

12 years agoUpdate xml transformations.
Rainer Jung [Tue, 8 Nov 2011 22:27:42 +0000 (22:27 +0000)]
Update xml transformations.

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

12 years agoRegenerate convenience.map.
Rainer Jung [Tue, 8 Nov 2011 22:22:23 +0000 (22:22 +0000)]
Regenerate convenience.map.

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

12 years agoUpdate xml meta files after fixing simplified chinese.
Rainer Jung [Tue, 8 Nov 2011 22:17:22 +0000 (22:17 +0000)]
Update xml meta files after fixing simplified chinese.

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