granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

projects / apache / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | 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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Rainer Jung [Tue, 8 Nov 2011 22:10:25 +0000 (22:10 +0000)]

Regenerated style files after simplified chinese fix.

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

commit | commitdiff | tree

Jim Jagielski [Tue, 8 Nov 2011 22:07:58 +0000 (22:07 +0000)]

Change def timeout from a nasty 5 mins to a more reasonable 1min

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

commit | commitdiff | tree

Rainer Jung [Tue, 8 Nov 2011 21:58:03 +0000 (21:58 +0000)]

Add "reallyall" and --enable-load-all-modules to
docs. Clarify LoadModule activation status.

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

commit | commitdiff | tree

Rainer Jung [Tue, 8 Nov 2011 21:56:02 +0000 (21:56 +0000)]

Fix XML validation errors.
Order matters.

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

commit | commitdiff | tree

Rainer Jung [Tue, 8 Nov 2011 21:54:39 +0000 (21:54 +0000)]

Fix docs generation for simplified chinese.

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

commit | commitdiff | tree

Rainer Jung [Tue, 8 Nov 2011 21:25:28 +0000 (21:25 +0000)]

Load all modules in the generated default configuration
when using --enable-load-all-modules with configure.

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 20:43:46 +0000 (20:43 +0000)]

update xforms

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 20:41:47 +0000 (20:41 +0000)]

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 20:36:03 +0000 (20:36 +0000)]

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

commit | commitdiff | tree

Rainer Jung [Tue, 8 Nov 2011 20:14:12 +0000 (20:14 +0000)]

Silence compiler warning about signedness differences.

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

commit | commitdiff | tree

Rainer Jung [Tue, 8 Nov 2011 20:02:33 +0000 (20:02 +0000)]

Fix make variable reference.

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 19:41:05 +0000 (19:41 +0000)]

Fix up some length limit calculation

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 03:09:08 +0000 (03:09 +0000)]

update xforms

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 03:06:08 +0000 (03:06 +0000)]

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

commit | commitdiff | tree

Sander Temme [Tue, 8 Nov 2011 02:12:41 +0000 (02:12 +0000)]

Point to list of undocumented modules in the docs subdirectory

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

commit | commitdiff | tree

Eric Covener [Tue, 8 Nov 2011 02:11:35 +0000 (02:11 +0000)]

add info about new early/late arguments and a note about
the directives whose context is limited.

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 02:10:57 +0000 (02:10 +0000)]

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

commit | commitdiff | tree

Eric Covener [Tue, 8 Nov 2011 01:53:15 +0000 (01:53 +0000)]

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 01:34:58 +0000 (01:34 +0000)]

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

commit | commitdiff | tree

Eric Covener [Tue, 8 Nov 2011 00:36:03 +0000 (00:36 +0000)]

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

commit | commitdiff | tree

Eric Covener [Tue, 8 Nov 2011 00:25:47 +0000 (00:25 +0000)]

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

commit | commitdiff | tree

Stefan Fritsch [Tue, 8 Nov 2011 00:20:24 +0000 (00:20 +0000)]

By default, only load those modules that are either required
or explicitly selected by a configure --enable-foo argument. The
LoadModule statements for modules enabled by --enable-mods-shared=most
and friends will be commented out.

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

commit | commitdiff | tree

Rainer Jung [Mon, 7 Nov 2011 23:57:06 +0000 (23:57 +0000)]

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

commit | commitdiff | tree

Sander Temme [Mon, 7 Nov 2011 23:55:27 +0000 (23:55 +0000)]

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 23:07:12 +0000 (23:07 +0000)]

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

commit | commitdiff | tree

Jeff Trawick [Mon, 7 Nov 2011 22:59:51 +0000 (22:59 +0000)]

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 22:58:52 +0000 (22:58 +0000)]

More error checking for ap_pregsub

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

commit | commitdiff | tree

Jeff Trawick [Mon, 7 Nov 2011 22:13:17 +0000 (22:13 +0000)]

auto var verbose not used

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 22:02:43 +0000 (22:02 +0000)]

remove solved Windows AcceptFilter blocker
add mod_lua blocker

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 21:58:52 +0000 (21:58 +0000)]

More ap_pregsub error checking/logging

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 21:47:39 +0000 (21:47 +0000)]

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 21:29:57 +0000 (21:29 +0000)]

Check return value of ap_pregsub()

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 21:13:40 +0000 (21:13 +0000)]

Fix integer overflow in ap_pregsub. This can be triggered e.g.
with mod_setenvif via a malicious .htaccess

CVE-2011-3607
http://www.halfdog.net/Security/2011/ApacheModSetEnvIfIntegerOverflow/

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 21:04:40 +0000 (21:04 +0000)]

No need to zero memory that we will overwrite anyway

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 20:57:02 +0000 (20:57 +0000)]

Only init the RNG once at startup. This saves some entropy and works around the APR bug
fixed in r1198921

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 20:53:12 +0000 (20:53 +0000)]

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

commit | commitdiff | tree

Jeff Trawick [Mon, 7 Nov 2011 20:05:19 +0000 (20:05 +0000)]

s/IP6/IPv6/

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 7 Nov 2011 18:46:47 +0000 (18:46 +0000)]

Call apr_random_after_fork() manually in the child processes because the MPMs
use plain fork() and not apr_proc_fork().
Also add some workaround for APR not changing the RNG state in the parent.

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

commit | commitdiff | tree

Eric Covener [Sat, 5 Nov 2011 01:08:05 +0000 (01:08 +0000)]

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

commit | commitdiff | tree

Eric Covener [Sat, 5 Nov 2011 00:16:36 +0000 (00:16 +0000)]

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

commit | commitdiff | tree

Gregg Lewis Smith [Sat, 5 Nov 2011 00:09:43 +0000 (00:09 +0000)]

remove unneeded dependency to mod_proxy_html

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

Unnamed repository; edit this file 'description' to name the repository.