]>
granicus.if.org Git - apache/log
Graham Leggett [Wed, 30 Nov 2011 11:21:43 +0000 (11:21 +0000)]
mod_cache: Revert http://svn.apache.org/viewvc?view=revision&revision=
1070179
as per the following thread:
http://www.gossamer-threads.com/lists/apache/dev/395830?do=post_view_threaded#395830
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208384 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 11:03:03 +0000 (11:03 +0000)]
Backport:
Introduce a per request version of the remote IP address, which can be
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).
Introduce a per connection "peer_ip" and a per request "client_ip" to
distinguish between the raw IP address of the connection and the effective
IP address of the request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208378 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 10:36:31 +0000 (10:36 +0000)]
Remove stray svn:mergeinfo properties, leaving the svn:mergeinfo at the
root of the project as the canonical mergeinfo property. Missed another one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208371 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 10:24:09 +0000 (10:24 +0000)]
Remove stray svn:mergeinfo properties, leaving the svn:mergeinfo at the
root of the project as the canonical mergeinfo property. Missed one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208365 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 10:21:09 +0000 (10:21 +0000)]
Remove stray svn:mergeinfo properties, leaving the svn:mergeinfo at the
root of the project as the canonical mergeinfo property.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208364 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Nov 2011 22:56:56 +0000 (22:56 +0000)]
RPM backport:
- Build shared mpms instead of static, reduce the RPM to a simple one
pass build of the server into a single binary and modules.
- Create a dedicated generic RPM layout, ensuring that all example
config files have the correct paths embedded within them.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208124 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 29 Nov 2011 22:30:42 +0000 (22:30 +0000)]
Merge r1208110:
Remove more log message prefixes that are now redundant as the
the error log format includes the module name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208112 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Nov 2011 21:29:11 +0000 (21:29 +0000)]
Backport:
mod_dbd: The dbd_prepared_init() function reported the result of the last
prepared statement, obscuring earlier errors. Fixed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208081 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Nov 2011 21:15:57 +0000 (21:15 +0000)]
Merge r1208067, r1208068, r1208069 from trunk:
whitespace
Some optimization... we have a hash, use it. Quicker than all
these string comparisons.
Ensure casing doesn't matter... (we know balancer->s->name is
lc)
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208071 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Nov 2011 15:36:44 +0000 (15:36 +0000)]
Merge r1207926 from trunk:
Logic which makes the balancer "active" or not... so we can turn them
off and on as needed.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1207927 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Nov 2011 13:13:03 +0000 (13:13 +0000)]
Merge r1207863 from trunk:
Instead of running thru all kinds of logic paths, just add in
a on/off bit... No need for other balancer statuses(sp)?
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1207864 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Nov 2011 00:24:35 +0000 (00:24 +0000)]
RPM: The default httpd mpm is now worker instead of prefork.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1207721 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Nov 2011 20:47:29 +0000 (20:47 +0000)]
Merge r1207582 from trunk:
Expose the path that the balancer handles...
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1207584 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Nov 2011 20:12:14 +0000 (20:12 +0000)]
Merge r1207562 from trunk:
Pull this out as a sep function to allow for full vhosting
adjustment between get and define balancers...
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1207563 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Nov 2011 17:10:39 +0000 (17:10 +0000)]
Merge r1207467 from trunk:
"Final" (I hope) proxy struct/API changes in order to support
dynamic balancer allocation AND dynamic vhost-balancers
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1207468 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 28 Nov 2011 15:11:47 +0000 (15:11 +0000)]
Merge r1207282 from trunk:
Error-check.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1207285 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 27 Nov 2011 20:28:59 +0000 (20:28 +0000)]
Merge r1206827:
Fix some warn_unused_result compiler warnings by checking the return code of
chown and logging an error if the error was not ENOENT.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206832 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 27 Nov 2011 19:45:49 +0000 (19:45 +0000)]
Made PR 52252 out of the luajit problem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206814 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 27 Nov 2011 18:03:10 +0000 (18:03 +0000)]
Merge r1206787 from trunk:
thx sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206788 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 27 Nov 2011 08:25:19 +0000 (08:25 +0000)]
Merge r1206680, r1206681, r1206682 from trunk:
Replace unusable/fringe absolute path example for AddDescription and list
some weird AddDescription semantics related to directories.
mention IndexIgnore limitation in DirectoryMatch and friends as currently
documented only in bugzilla (PR51471)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206683 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Nov 2011 21:47:46 +0000 (21:47 +0000)]
Backport from trunk:
Remove unused variables.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206340 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 25 Nov 2011 21:42:21 +0000 (21:42 +0000)]
Backport from trunk:
Remove unused variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206337 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 25 Nov 2011 19:28:59 +0000 (19:28 +0000)]
Merge r1206286 from trunk:
Move useful and shared balancer stuff to the shm slot...
Provide hooks for post-config/runtime addition of
balancers.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206287 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 25 Nov 2011 17:32:44 +0000 (17:32 +0000)]
Merge r1206268 from trunk:
Allow compile time changes of field sizes and be more
"clear" regarding the diff between balancer and worker slots...
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206269 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 25 Nov 2011 13:31:47 +0000 (13:31 +0000)]
Merge r1206159 from trunk:
Comment reason for NULL parameter
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1206160 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 24 Nov 2011 15:54:30 +0000 (15:54 +0000)]
Merge r1205894 from trunk:
Use varargs...
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205895 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Thu, 24 Nov 2011 15:41:09 +0000 (15:41 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205889 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Thu, 24 Nov 2011 15:36:39 +0000 (15:36 +0000)]
backport r1205885
Pr#52239: clarify Event MPM's behaviour with strictly
synchronous libraries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205886 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 24 Nov 2011 14:39:35 +0000 (14:39 +0000)]
userland change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205850 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 23 Nov 2011 20:40:01 +0000 (20:40 +0000)]
Merge r1203634, r1204614, r1205564:
Pass ap_errorlog_info to error_log hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205573 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 23 Nov 2011 20:35:09 +0000 (20:35 +0000)]
Merge r1205568 from trunk, add util_regex.c to MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205569 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 23 Nov 2011 20:10:01 +0000 (20:10 +0000)]
Merge r1205560 from trunk:
mod_ratelimit has an output filter, not a handler. Also took a quick
pass through the other text.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205561 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 23 Nov 2011 20:00:57 +0000 (20:00 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205557 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 23 Nov 2011 19:58:05 +0000 (19:58 +0000)]
Merge r1205550:
The expression parser is not only a developer change.
Mention reduced memory usage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205555 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 23 Nov 2011 19:43:06 +0000 (19:43 +0000)]
Merge r1205542:
Make it more explicit that mod_lua may change in 2.4.x
And another blocker is gone.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205545 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 23 Nov 2011 19:32:05 +0000 (19:32 +0000)]
By consensous on the list, mod_request will stay at least for 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205541 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 23 Nov 2011 16:05:56 +0000 (16:05 +0000)]
Merge r1205468 from trunk:
specify limited context list for ModemStandard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205469 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 23 Nov 2011 15:02:46 +0000 (15:02 +0000)]
Merge r1205423 from trunk:
Use ap_pass_brigade_fchk()
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205425 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 23 Nov 2011 15:02:28 +0000 (15:02 +0000)]
Merge r1205419 from trunk:
Add ap_pass_brigade_fchk() which does a Filter CHecK on the
brigade pass.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205424 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Wed, 23 Nov 2011 12:26:47 +0000 (12:26 +0000)]
rebuild transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205382 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Wed, 23 Nov 2011 12:22:56 +0000 (12:22 +0000)]
backport r1205379.
mod_session: document overrides.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205380 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 23 Nov 2011 03:45:47 +0000 (03:45 +0000)]
Merge r1205274 from trunk:
mod_negotiation: don't return non-AP_FILTER_ERROR filter return values
to ap_run_handler() when sending a body directly from a type-map.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205278 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 22 Nov 2011 21:22:22 +0000 (21:22 +0000)]
Add some known issues / maybe-blockers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205179 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 22 Nov 2011 15:58:52 +0000 (15:58 +0000)]
Clarify why it matters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205053 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 22 Nov 2011 15:46:54 +0000 (15:46 +0000)]
Further thoughts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205042 13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Tue, 22 Nov 2011 15:34:47 +0000 (15:34 +0000)]
garbage C's in server-status and extra processes with async lingering close.
backport r1203708 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205039 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 22 Nov 2011 14:22:36 +0000 (14:22 +0000)]
Clarify my thoughts on mod_remoteip.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1205014 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 22 Nov 2011 14:02:53 +0000 (14:02 +0000)]
Merge r1204998 from trunk:
Hello. Let's compile again.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204999 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 22 Nov 2011 11:34:33 +0000 (11:34 +0000)]
Cleanup and fix STATUS for 2.4.x, add some
generic comments mostly taken over from 2.2.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204929 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 21 Nov 2011 23:07:16 +0000 (23:07 +0000)]
Merge r1204104,
1204180 :
Remove MPM-private stuff from conn_state_t.
This should make it easier to improve the event MPM in 2.4 without breaking
the API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204743 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 21 Nov 2011 22:24:12 +0000 (22:24 +0000)]
Merge r1204087,
1204090 :
Limit recursion in ap_expr evaluation to avoid unbounded stack usage
* evaluate chains of ||, &&, and string concatenation non-recursively
* limit other types of recursion to 20 levels
* avoid some string copies if concatenating more than 2 strings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204730 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 21 Nov 2011 18:18:49 +0000 (18:18 +0000)]
backport r1204630:
Downgrade some more error messages about broken client behavior to level
info.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204632 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 21 Nov 2011 17:09:44 +0000 (17:09 +0000)]
Backport:
mod_cache_disk: Make sure we check return codes on all writes and attempts
to close, and clean up after ourselves in these cases. PR43589.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204602 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 21 Nov 2011 17:03:06 +0000 (17:03 +0000)]
Backport r1204595:
Fix logic when to call error_log hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204597 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:55:29 +0000 (15:55 +0000)]
Merge r1204555 from trunk:
value never used: dead assignment
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204561 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:55:10 +0000 (15:55 +0000)]
Merge r1204556 from trunk:
check return status
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204560 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:54:16 +0000 (15:54 +0000)]
Merge r1204553 from trunk:
Never used.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204559 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 05:13:45 +0000 (05:13 +0000)]
rollback recent autoindex changes (
1204355 :
1204306 )
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204357 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 03:30:30 +0000 (03:30 +0000)]
Merge r1204341 from trunk:
PR51471: IndexIgnore doesn't work in DirectoryMatch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204342 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 01:40:29 +0000 (01:40 +0000)]
missed in
1204319
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204320 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 01:40:15 +0000 (01:40 +0000)]
Merge r1204317 from trunk:
upgrading/compat notes on some unexpected AddDescription behavior
also: mention in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204319 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 01:04:58 +0000 (01:04 +0000)]
Merge r1204307 from trunk:
PR39923: Allow AddDescription to work with absolute filesystem paths,
by not adding "*/" to their prefix (intended for relative paths)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204309 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 20 Nov 2011 17:53:53 +0000 (17:53 +0000)]
Backport:
mod_include: The SSIAccessEnable directive existed to ensure the addition
of the "-A" syntax would not break existing configurations in v2.2. Remove
the directive for v2.4, defaulting the behaviour to enabled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204200 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 19 Nov 2011 23:05:46 +0000 (23:05 +0000)]
Backport:
mod_cache_disk: Remove the unnecessary intermediate brigade while
writing to disk. Fixes a problem where mod_disk_cache was leaving
buckets in the intermediate brigade and not passing them to out on
exit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1204102 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 19 Nov 2011 00:36:47 +0000 (00:36 +0000)]
backport r1203924 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203925 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 18 Nov 2011 22:06:26 +0000 (22:06 +0000)]
Backport r1203878:
More ap_log_rerror() usage and axe some more AJP: prefixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203881 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 18 Nov 2011 22:04:28 +0000 (22:04 +0000)]
Backport r1203868:
Log fatal errors at level CRIT, not at some random level from DEBUG to EMERG
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203880 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 18 Nov 2011 22:02:03 +0000 (22:02 +0000)]
Style fixes, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203877 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 18 Nov 2011 21:44:43 +0000 (21:44 +0000)]
Backport r1203859:
great proxy logging cleanup:
* remove "proxy:", "FCGI", etc. prefixes and pid which are now
included in the error log format
* propagate frontend request's logconfig to backend request
* use ap_log_rerror where possible
* remove obsolete APLOG_NOERRNO
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203861 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Nov 2011 17:38:53 +0000 (17:38 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203762 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Nov 2011 17:18:31 +0000 (17:18 +0000)]
merge r1203752 from trunk:
Change the SSLCipherSuite default to a shorter, whitelist
oriented definition, and add an example for a speed-optimized
configuration (commented out by default).
In the SSL How-To, streamline the SSLCipherSuite examples where
applicable (explicitly banning EXP and NULL is not needed when
only HIGH is specified).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203753 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Nov 2011 13:32:39 +0000 (13:32 +0000)]
r1203331 from trunk:
s/WATCHODG/WATCHDOG/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1203646 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
projects / apache / log