]> granicus.if.org Git - apache/log
apache
12 years agoMerge r1206680, r1206681, r1206682 from trunk:
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

12 years agoBackport from trunk:
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

12 years agoBackport from trunk:
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

12 years agoMerge r1206286 from trunk:
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

12 years agoMerge r1206268 from trunk:
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

12 years agoMerge r1206159 from trunk:
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

12 years agoMerge r1205894 from trunk:
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

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

12 years agobackport r1205885
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

12 years agouserland change
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

12 years agoMerge r1203634, r1204614, r1205564:
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

12 years agoMerge r1205568 from trunk, add util_regex.c to MPM
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

12 years agoMerge r1205560 from trunk:
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

12 years agoxforms
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

12 years agoMerge r1205550:
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

12 years agoMerge r1205542:
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

12 years agoBy consensous on the list, mod_request will stay at least for 2.4.x
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

12 years agoMerge r1205468 from trunk:
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

12 years agoMerge r1205423 from trunk:
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

12 years agoMerge r1205419 from trunk:
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

12 years agorebuild transforms
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

12 years agobackport r1205379.
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

12 years agoMerge r1205274 from trunk:
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

12 years agoAdd some known issues / maybe-blockers
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

12 years agoClarify why it matters.
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

12 years agoFurther thoughts.
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

12 years agogarbage C's in server-status and extra processes with async lingering close.
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

12 years agoClarify my thoughts on mod_remoteip.
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

12 years agoMerge r1204998 from trunk:
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

12 years agoCleanup and fix STATUS for 2.4.x, add some
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

12 years agoMerge r1204104, 1204180:
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

12 years agoMerge r1204087, 1204090:
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

12 years agobackport r1204630:
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

12 years agoBackport:
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

12 years agoBackport r1204595:
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

12 years agoMerge r1204555 from trunk:
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

12 years agoMerge r1204556 from trunk:
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

12 years agoMerge r1204553 from trunk:
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

12 years agorollback recent autoindex changes (1204355:1204306)
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

12 years agoMerge r1204341 from trunk:
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

12 years agomissed in 1204319
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

12 years agoMerge r1204317 from trunk:
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

12 years agoMerge r1204307 from trunk:
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

12 years agoBackport:
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

12 years agoBackport:
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

12 years agobackport r1203924 from trunk
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

12 years agoBackport r1203878:
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

12 years agoBackport r1203868:
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

12 years agoStyle fixes, no functional change.
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

12 years agoBackport r1203859:
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

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

12 years agomerge r1203752 from trunk:
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

12 years agor1203331 from trunk:
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

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