]>
granicus.if.org Git - apache/log
Joe Orton [Mon, 27 Jun 2011 09:27:04 +0000 (09:27 +0000)]
Fix load order dependencies in LDAP code by switching to use of APR
optional functions for the inter-module API:
* modules/ldap/ldap_private.h: New file, containing "real" function
declarations, copied from...
* include/ap_ldap.h.in, include/ap_ldap_url.h,
include/ap_ldap_option.h, include/ap_ldap_init.h,
include/ap_ldap_rebind.h: ... here. All declarations changed to APR
optional function declarations.
* modules/ldap/util_ldap.c (util_ldap_register_hooks): Register all
the new optional functions.
* modules/aaa/mod_authnz_ldap.c (ImportULDAPOptFn): Pick up optional
function stub for ap_ldap_url_parse.
(mod_auth_ldap_parse_url): Use it here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1140069 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Jun 2011 15:17:31 +0000 (15:17 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1139549 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 25 Jun 2011 12:44:08 +0000 (12:44 +0000)]
dox fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1139540 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 25 Jun 2011 12:00:26 +0000 (12:00 +0000)]
Support specifying the local address to use.
PR: 48930.
Submitted by: Peter Schuller <scode spotify com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1139530 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 24 Jun 2011 18:48:52 +0000 (18:48 +0000)]
Missing linebreak in example.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1139407 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 24 Jun 2011 18:46:14 +0000 (18:46 +0000)]
Correct link to mod_macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1139406 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 24 Jun 2011 18:44:36 +0000 (18:44 +0000)]
Corrects link to rewrite mass vhosting doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1139405 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 24 Jun 2011 17:59:44 +0000 (17:59 +0000)]
Fix "statement not reached" warnings with sun cc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1139391 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 22 Jun 2011 21:34:41 +0000 (21:34 +0000)]
update transforms, 2nd try :-/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1138643 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 22 Jun 2011 21:28:38 +0000 (21:28 +0000)]
Update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1138640 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 22 Jun 2011 20:45:34 +0000 (20:45 +0000)]
Various code cleanup
PR: 51398
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1138627 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 22 Jun 2011 20:24:27 +0000 (20:24 +0000)]
We already have ap_str_tolower(), so also add ap_str_toupper() function and use
it where possible.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1138617 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 22 Jun 2011 20:22:24 +0000 (20:22 +0000)]
Add support to ErrorLogFormat for logging the system unique
thread id under Linux
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1138616 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 22 Jun 2011 20:16:43 +0000 (20:16 +0000)]
Fix build with recent apr_crypto API change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1138611 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 20 Jun 2011 22:57:24 +0000 (22:57 +0000)]
Log the deprecation warning at level info, not warn
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137813 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 20 Jun 2011 19:47:23 +0000 (19:47 +0000)]
Fix search'n'replace error: Actually warn if MaxClients is used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137757 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 20 Jun 2011 19:45:08 +0000 (19:45 +0000)]
New AsyncRequestWorkerFactor directive to influence how many
connections will be accepted per process
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137755 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 20 Jun 2011 19:06:27 +0000 (19:06 +0000)]
Remove dead assignment, as pointed out by Chris Wilson <cwilson vigilantsw com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137748 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 20 Jun 2011 19:00:52 +0000 (19:00 +0000)]
Rename MaxClients to MaxRequestWorkers which describes more accurately what
it does.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137744 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Jun 2011 10:28:05 +0000 (10:28 +0000)]
rotatelogs: Add support for running a custom program after a log
rotation.
* support/rotatelogs.c (post_rotate): New function.
(usage, dumpConfig): Update.
(doRotate): Save old filename before rotate; call post_rotate after
successful rotation.
(main): Add -p argument.
* docs/manual/programs/rotatelogs.xml: Document -p.
PR: 51285
Submitted by: <sveniu ifi.uio.no>, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137590 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 19 Jun 2011 18:50:12 +0000 (18:50 +0000)]
Code cleanup: replace apr_table_set with non-copying apr_table_setn
in a few places
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137413 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 19 Jun 2011 18:19:42 +0000 (18:19 +0000)]
Don't do OCSP checks for valid self-issued certs
Submitted by: Kaspar Brand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137398 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 19 Jun 2011 18:03:55 +0000 (18:03 +0000)]
Avoid unnecessary renegotiations with SSLVerifyDepth 0.
PR: 48215
Submitted by: Kaspar Brand <asfbugz velox ch>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137394 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 19 Jun 2011 12:27:23 +0000 (12:27 +0000)]
Display information about asynchronous connections in the server-status
PR: 44377
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137360 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 19 Jun 2011 12:23:42 +0000 (12:23 +0000)]
Some improvements for handling of many connections for MPM event:
- Process lingering close asynchronously instead of tying up worker threads
(based on patch by Jeff Trawick).
- If the number of connections of a process is above
threads_per_child + WORKER_OVERCOMMIT * (idle_workers - 1)
(WORKER_OVERCOMMIT is fixed at 2, at the moment), or if all workers are busy,
don't accept new connections in that process. Such a dynamic connection limit
is necessary because we may have both async and non-async (ssl) connections.
WORKER_OVERCOMMIT should be a config option.
- Don't count idle workers of not-accepting processes against MinSpareThreads,
so that the parent will spawn new processes when necessary.
- If we receive a keep-alive request while all workers are busy, don't block
but close the connection immediately so that the client will re-connect to a
different process.
Related changes:
- Log what is going on at trace loglevels.
- Remove the bypass_push poll type flag, this code cannot be hit anymore
(if it ever could?).
- Add some macro helpers for dealing with timeout queues.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137358 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jun 2011 11:37:18 +0000 (11:37 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137343 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jun 2011 11:35:34 +0000 (11:35 +0000)]
remove duplicate entry / duplicate ID
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137342 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jun 2011 11:30:51 +0000 (11:30 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137341 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 19 Jun 2011 11:24:29 +0000 (11:24 +0000)]
property and xml fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137340 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 18 Jun 2011 22:29:49 +0000 (22:29 +0000)]
If MaxMemFree is set, limit the number of recycled pools that is kept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137262 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 18 Jun 2011 22:24:53 +0000 (22:24 +0000)]
Some logging tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137261 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 18 Jun 2011 22:23:53 +0000 (22:23 +0000)]
Formatting changes, reuse 'now' variable instead of declaring a new one
in several blocks.
No significant code change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137260 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 18 Jun 2011 19:43:47 +0000 (19:43 +0000)]
Rebuild a few out of date files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137234 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jun 2011 13:53:59 +0000 (13:53 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137185 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 18 Jun 2011 13:21:20 +0000 (13:21 +0000)]
Fix graceful restart aborting connections
PR: 43359
Submitted by: Takashi Sato <takashi lans-tv com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137182 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 17 Jun 2011 21:12:14 +0000 (21:12 +0000)]
s/seperate/separate/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1137024 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 17 Jun 2011 18:14:45 +0000 (18:14 +0000)]
revert this... sorry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1136966 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 17 Jun 2011 17:15:57 +0000 (17:15 +0000)]
No mo subpool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1136947 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 17 Jun 2011 17:15:54 +0000 (17:15 +0000)]
Revert "fix unexpected enum operation"
This reverts commit
d407a566ab24e576a3f143f5c27b2ccf90f5d8da .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1136946 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 15 Jun 2011 15:51:57 +0000 (15:51 +0000)]
fix unexpected enum operation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1136096 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 21:13:08 +0000 (21:13 +0000)]
Update redirect-carefully workaround for WebDAVFS 1.4, Konqueror 4.x
PR: 43031
Submitted by: Hans de Graaff, Stefan Fritsch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135286 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 19:48:09 +0000 (19:48 +0000)]
Simplify code with ap_str_tolower()
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135252 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 19:30:05 +0000 (19:30 +0000)]
AFAICS, we don't have a default cipher suite but depend on openssl's default.
Document the fact that this default depends on the openssl version.
Recommend !aNULL over !ADH, because the former also excludes !AECDH in openssl
1.0+
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135241 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 19:21:57 +0000 (19:21 +0000)]
Disable AECDH ciphers in example config by using !aNULL (which includes
all ciphers without authentication.
PR: 51363
Submitted by: Rob Stradling <rob comodo com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135234 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 16:50:41 +0000 (16:50 +0000)]
Remove spurious braces to fix clang warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135171 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 16:49:48 +0000 (16:49 +0000)]
Fix handling of cumulative system time
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135170 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 16:02:18 +0000 (16:02 +0000)]
Introduce new function ap_get_conn_socket() to access the socket of
a connection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135153 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 11:20:18 +0000 (11:20 +0000)]
Code cleanup:
1) use apr_palloc instead of apr_pcalloc when all the fields of the allocated
structure are set afterwards.
2) avoid useless calls to 'strcasecmp' when we have already found what we are
looking for.
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51329
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135089 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 11:11:48 +0000 (11:11 +0000)]
Merge repeated calls of ap_rputs.
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51330
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135085 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 11:04:29 +0000 (11:04 +0000)]
Avoid some memory allocations by using apr_table_setn where the string arguments
are allocated from the request pool and not modified later on.
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51358
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135084 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Jun 2011 10:58:10 +0000 (10:58 +0000)]
Avoid some memory allocations by using apr_table_setn where the string
arguments are const.
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51357
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1135083 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 12 Jun 2011 10:40:17 +0000 (10:40 +0000)]
Avoid "`sentinel' attribute directive ignored" warning with gcc 3.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1134906 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jun 2011 15:38:13 +0000 (15:38 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1134674 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 10 Jun 2011 10:52:03 +0000 (10:52 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1134275 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 9 Jun 2011 23:45:37 +0000 (23:45 +0000)]
Ensure variable is initialised before use.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1134132 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 9 Jun 2011 23:41:00 +0000 (23:41 +0000)]
For safety, pass trailing buckets following EOS down the stack. Pass flush
buckets down the stack immediately. Move apr_brigade_partition() to be
called as late as possible.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1134130 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 8 Jun 2011 22:13:21 +0000 (22:13 +0000)]
mod_data: Introduce a filter to support RFC2397 data URLs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1133582 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 7 Jun 2011 20:58:45 +0000 (20:58 +0000)]
Log the proper module name on errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1133163 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 7 Jun 2011 20:55:56 +0000 (20:55 +0000)]
Log a more obvious message if apr cannot load its dbm shared library.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1133158 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 7 Jun 2011 20:40:21 +0000 (20:40 +0000)]
Don't return an undefined value if opening of a read-only database fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1133152 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 6 Jun 2011 22:44:31 +0000 (22:44 +0000)]
mod_cache: Ensure that r->content_type is set when serving stale
content in response to a failed attempt to revalidate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132816 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 Jun 2011 22:17:44 +0000 (22:17 +0000)]
Update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132803 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 Jun 2011 22:09:22 +0000 (22:09 +0000)]
purge some useless uses of '.*'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132802 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 Jun 2011 22:07:58 +0000 (22:07 +0000)]
The example configuration looks good enough to me
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132801 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 Jun 2011 21:46:14 +0000 (21:46 +0000)]
Make the MSIE BrowserMatch regexp fit for MSIE 10. Remove useless '.*'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132793 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 Jun 2011 21:40:41 +0000 (21:40 +0000)]
Use Require method instead of deprecated Limit/LimitExcept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132790 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 Jun 2011 21:26:56 +0000 (21:26 +0000)]
Introduce ap_(get|set)_core_module_config() functions/macros and use them
everywhere.
We know that the core module has module_index 0. Therefore we can save
some pointer operations in ap_get_module_config(cv, &core_module) and
ap_set_module_config(cv, &core_module, val). As these are called rather often,
this may actually have some (small) measurable effect.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132781 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jun 2011 15:42:06 +0000 (15:42 +0000)]
TraceEnable is per-virtualhost, not just per-server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132676 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 5 Jun 2011 21:33:12 +0000 (21:33 +0000)]
- Introduce concept of context prefix (which is an URL prefix)
and context document root (which is the file system directory that
this URL prefix is mapped to). This generalization of the document
root makes it easier for scripts to create self-referential URLs and
to find their files.
- Expose CONTEXT_DOCUMENT_ROOT and CONTEXT_PREFIX as envvars, in mod_rewrite,
and in ap_expr.
- Make mod_alias and mod_userdir set the context information.
- Allow to override the document root on a per-request basis. This allows
mass vhosting modules to set DOCUMENT_ROOT correctly.
- Make mod_vhost_alias set the per-request document root
PR: 26052, 46198, 49705
Remaining tasks:
- Use the context document root & prefix in mod_rewrite to make RewriteBase
unneccessary in many cases. Do this without breaking compatibility.
- Write docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132494 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 5 Jun 2011 18:15:02 +0000 (18:15 +0000)]
- Add <ElseIf> and <Else> to complement <If> sections. These are both easier
to use and more efficient than using several <If> sections.
- Update <If> documentation a bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132469 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 5 Jun 2011 18:06:42 +0000 (18:06 +0000)]
Fix wrong condition that may lead to NULL being set as 'Vary' header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1132467 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Jun 2011 19:04:54 +0000 (19:04 +0000)]
Reorder members in core_dir_config to be more logical and efficient.
MMN bump was already in r1131465
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131468 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Jun 2011 19:00:16 +0000 (19:00 +0000)]
Add __attribute__((sentinel)) to a few functions that require a terminal NULL
argument.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131467 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Jun 2011 18:50:55 +0000 (18:50 +0000)]
Make ap_rputs an inline function, as it is mostly used with string constants
and this allows the compiler to optimize the strlen() call away.
Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131465 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Jun 2011 18:43:35 +0000 (18:43 +0000)]
Use define'd names for constants
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131463 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Jun 2011 17:41:13 +0000 (17:41 +0000)]
Avoid using a tmpfile with fixed name when creating export_files, since this
is bad for parallel builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131446 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Jun 2011 16:53:47 +0000 (16:53 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131435 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Jun 2011 13:31:49 +0000 (13:31 +0000)]
Several fixes for the ap_ldap build logic. This should fix compilation
without --with-ldap.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1131393 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2011 15:25:20 +0000 (15:25 +0000)]
PR51307: Fix ldap_rebind build error when ldap is enabled and APR is built without threads.
Submitted By: Philipp <pippo deo.li>
Reviewed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1130186 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 1 Jun 2011 13:26:53 +0000 (13:26 +0000)]
* modules/ssl/ssl_engine_pphrase.c: Fix comment, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1130145 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 1 Jun 2011 07:01:56 +0000 (07:01 +0000)]
Some small progress towards building against apr[util] 1.x or apr 2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1130022 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 22:59:53 +0000 (22:59 +0000)]
Fix include path relative to modules/ldap/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129956 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 20:55:02 +0000 (20:55 +0000)]
solve getpid() process.h function order
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129914 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 20:02:03 +0000 (20:02 +0000)]
LDAP_DECLARE Header adjustment for nw/win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129891 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:57:07 +0000 (19:57 +0000)]
Shift declaration logic of LDAP_DECLARE to ap_ldap.h from util_ldap.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129886 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:56:16 +0000 (19:56 +0000)]
I can't be the only person in need of this helper :) This should untangle
all of the complexities of building httpd against srclib/apr/ alone (along
with a seperate copy of srclib/expat/ owing to the removal of expat from
the apr tree).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129885 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:38:21 +0000 (19:38 +0000)]
Missed the sortation order on rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129879 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 19:37:56 +0000 (19:37 +0000)]
This is rather irritating.
We override exit() throughout the httpd build in order to intercept and
report our status through the service control manager.
We must include process.h prior to overriding exit().
I seem to remember that this is the reason apr.hw once included
process.h unilaterally, to avoid this conflict over exit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129878 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 31 May 2011 17:10:11 +0000 (17:10 +0000)]
Incorporate the ap_ldap incomplete API, as there is no interest or effort
at APR to make this a complete abstraction, and it was voted 'off the island'
with APR 2.0. This will allow httpd 2.3 to build against either apr-2.0
or apr+util 1.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1129808 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 18:28:57 +0000 (18:28 +0000)]
mod_ext_filter: Remove DebugLevel option in favor of per-module loglevel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128732 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 11:53:34 +0000 (11:53 +0000)]
Fix cut'n'paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128617 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 11:51:17 +0000 (11:51 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128616 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 11:47:55 +0000 (11:47 +0000)]
Use the new "ap_expr" expression parser.
The old parser can still be used by setting the new directive
SSILegacyExprParser
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128614 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 07:01:47 +0000 (07:01 +0000)]
Add some features to ap_expr for use by mod_include:
* a restricted mode that does not allow to bypass request access restrictions
* new variables DOCUMENT_URI (alias for REQUEST_URI), LAST_MODIFIED
* -A as an alias for -U
* an additional data entry in ap_expr_eval_ctx_t for use by the consumer
* an extensible ap_expr_exec_ctx() API that allows to use that data entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128564 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 28 May 2011 05:55:35 +0000 (05:55 +0000)]
Fix config setting after r1128430 has changed some elements from int to char
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128557 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 27 May 2011 19:28:11 +0000 (19:28 +0000)]
properly merge directory configs in mod_include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1128430 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 26 May 2011 14:15:33 +0000 (14:15 +0000)]
Rebuild transformations of numerous files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1127929 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 26 May 2011 14:01:00 +0000 (14:01 +0000)]
Rebuild transformations for r1127905
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1127920 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 26 May 2011 13:40:46 +0000 (13:40 +0000)]
Mention that the error log format is now configurable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1127905 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 23 May 2011 16:41:00 +0000 (16:41 +0000)]
mod_cache: Clarify which scenario we have present, quick handler on and CACHE
filter present, which is an error, or the CACHE filter being present when the
cache is bypassed, which is business as usual.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1126575 13f79535 -47bb-0310-9956-
ffa450edef68