]>
granicus.if.org Git - apache/log
Graham Leggett [Mon, 21 Nov 2011 17:06:15 +0000 (17:06 +0000)]
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/trunk@
1204599 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 21 Nov 2011 17:01:10 +0000 (17:01 +0000)]
Fix logic when to call error_log hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204595 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:51:48 +0000 (15:51 +0000)]
value never used: dead assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204558 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:51:46 +0000 (15:51 +0000)]
check return status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204556 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:51:44 +0000 (15:51 +0000)]
value never used: dead assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204555 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:51:43 +0000 (15:51 +0000)]
value never used : dead assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204554 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Nov 2011 15:51:40 +0000 (15:51 +0000)]
Never used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204553 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 05:12:12 +0000 (05:12 +0000)]
roll back pair of recent autoindex changes (
1204355 :
1204306 )
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204356 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 03:29:12 +0000 (03:29 +0000)]
PR51471: IndexIgnore doesn't work in DirectoryMatch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204341 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 01:38:11 +0000 (01:38 +0000)]
upgrading/compat notes on some unexpected AddDescription behavior
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204317 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Nov 2011 01:03:15 +0000 (01:03 +0000)]
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/trunk@
1204307 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 20 Nov 2011 16:49:38 +0000 (16:49 +0000)]
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/trunk@
1204183 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 20 Nov 2011 16:41:42 +0000 (16:41 +0000)]
Fix segfault caused by r1204104 on non-async mpms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204180 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 19 Nov 2011 23:35:46 +0000 (23:35 +0000)]
Remove MPM-private stuff from conn_state_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204104 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 19 Nov 2011 22:37:55 +0000 (22:37 +0000)]
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/trunk@
1204101 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 19 Nov 2011 22:06:16 +0000 (22:06 +0000)]
clarify comment
remove broken recursion counting bits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1204090 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 19 Nov 2011 21:58:48 +0000 (21:58 +0000)]
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/trunk@
1204087 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Nov 2011 14:12:55 +0000 (14:12 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203980 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 19 Nov 2011 00:35:17 +0000 (00:35 +0000)]
Build mod_allowmethods on Windows
project file exists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203924 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 18 Nov 2011 22:02:27 +0000 (22:02 +0000)]
More ap_log_rerror() usage and axe some more AJP: prefixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203878 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 18 Nov 2011 22:00:35 +0000 (22:00 +0000)]
Style fixes, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203875 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 18 Nov 2011 21:49:44 +0000 (21:49 +0000)]
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/trunk@
1203868 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 18 Nov 2011 21:41:09 +0000 (21:41 +0000)]
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/trunk@
1203859 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Nov 2011 21:39:33 +0000 (21:39 +0000)]
follow up to r1202257 -- perform normal wakeup processing when
APR_EINTR is seen from apr_pollset_poll(), with expectation that
it was triggered by apr_pollset_wakeup()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203858 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 18 Nov 2011 19:12:31 +0000 (19:12 +0000)]
* Actually change the defines and not only the comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203792 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Nov 2011 17:37:36 +0000 (17:37 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203761 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Nov 2011 17:17:20 +0000 (17:17 +0000)]
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/trunk@
1203752 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 18 Nov 2011 16:12:05 +0000 (16:12 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203714 13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 18 Nov 2011 15:54:18 +0000 (15:54 +0000)]
garbage C's in server-status and extra child processes with async lingering
close support in Event. these are set by the listener due to a residual
c->sbh for a worker thread no longer associated with the connection.
the associated worker threads are really idle and blocked in
ap_queue_pop_something and will serve new work normally. but since they
are marked as SERVER_CLOSING rather than SERVER_READY in the scoreboard,
the parent process thinks they are busy and forks extra children.
reproduction recipe: start Event with server-status enabled. hit
localhost/server-status?refresh=5 and watch the C's trail behind the lone W.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203708 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Nov 2011 13:14:42 +0000 (13:14 +0000)]
no 2.5 alphas yet, so drop the entries for changes also in
2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203636 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Nov 2011 13:10:06 +0000 (13:10 +0000)]
add conn_rec to error log hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203634 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Nov 2011 12:59:36 +0000 (12:59 +0000)]
remove lingering reslist cruft
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203632 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 18 Nov 2011 05:27:00 +0000 (05:27 +0000)]
drop SSLv2 support (set SSL_OP_NO_SSLv2 for any new SSL_CTX)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203491 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Nov 2011 22:48:35 +0000 (22:48 +0000)]
event no longer requires APR_POLLSET_THREADSAFE, or any
other non-standard feature (all but OS/2 have APR_POLLSET_WAKEABLE)
config-foo: don't require thread-safe pollset in order to
build event
event.c: don't stress APR_ENOTIMPL in apr_pollset_create errors;
just give the standard "check system or user limits"
message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203404 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Nov 2011 22:45:10 +0000 (22:45 +0000)]
silly indentation fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203400 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 17 Nov 2011 19:07:08 +0000 (19:07 +0000)]
s/WATCHODG/WATCHDOG/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1203331 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 16 Nov 2011 21:08:50 +0000 (21:08 +0000)]
Avoid one apr_time_now() call in the fast path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202886 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 16 Nov 2011 06:27:41 +0000 (06:27 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202537 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 15 Nov 2011 23:45:54 +0000 (23:45 +0000)]
Add mod_data project file missing from r1202365
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202474 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 15 Nov 2011 22:53:17 +0000 (22:53 +0000)]
add new ldap features, make ap_expr entry more verbose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202456 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 15 Nov 2011 22:49:14 +0000 (22:49 +0000)]
Fix xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202453 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 15 Nov 2011 19:38:31 +0000 (19:38 +0000)]
spellcheck r1202258
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202395 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 15 Nov 2011 18:36:06 +0000 (18:36 +0000)]
Add mod_data to Windown build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202365 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 15 Nov 2011 17:47:33 +0000 (17:47 +0000)]
Calculate the power of two size of the buffer before allocating it.
Spotted by: Rüdiger Plüm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202329 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 15 Nov 2011 17:46:27 +0000 (17:46 +0000)]
Fix comment style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202328 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 15 Nov 2011 17:17:36 +0000 (17:17 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202314 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 15 Nov 2011 16:56:16 +0000 (16:56 +0000)]
update version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202303 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 15 Nov 2011 16:45:56 +0000 (16:45 +0000)]
We're now on 2.5.0 ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202296 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 15 Nov 2011 15:52:59 +0000 (15:52 +0000)]
Use apr_pollset_wakeup to ensure that the listener thread will process most enqueue'd events quickly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202259 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 15 Nov 2011 15:52:00 +0000 (15:52 +0000)]
Because the pollset is now only mutated from the event thread, we no longer need the APR_POLLSET_THREADSAFE flag for the event_pollset
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202258 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 15 Nov 2011 15:51:03 +0000 (15:51 +0000)]
Create a new lock free circular queue, and use it in the EventMPM to remove the timeout mutex that was wrapping both timeout queue operations and pollset operations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202257 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 15 Nov 2011 15:50:09 +0000 (15:50 +0000)]
Instead of disabling the listening sockets from the pollset when under load, just stop calling the accept call, but leave the sockets in the pollset.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202256 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 15 Nov 2011 15:49:19 +0000 (15:49 +0000)]
disable mod_reqtimeout if not configured
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202255 13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Tue, 15 Nov 2011 15:20:38 +0000 (15:20 +0000)]
ap_core_translate: factor out duplicate code. no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1202236 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/trunk@
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/trunk@
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/trunk@
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/trunk@
1201977 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 14 Nov 2011 22:56:24 +0000 (22:56 +0000)]
Fixed NetWare install.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201956 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 14 Nov 2011 21:55:07 +0000 (21:55 +0000)]
Since we have branched 2.4.x we are now at 2.5.0 in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201924 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 14 Nov 2011 21:39:19 +0000 (21:39 +0000)]
Added apreq to NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201918 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/trunk@
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/trunk@
1201729 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Nov 2011 13:15:09 +0000 (13:15 +0000)]
followups on PR52175
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201690 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 14 Nov 2011 12:12:14 +0000 (12:12 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201675 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 14 Nov 2011 01:58:02 +0000 (01:58 +0000)]
PR52175: RewriteBase is what applies to relative substitutions, not
the stripping of the per-directory prefix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201571 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Nov 2011 17:10:03 +0000 (17:10 +0000)]
add some todos from my apachecon notes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201460 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Nov 2011 16:55:55 +0000 (16:55 +0000)]
clarify looping issue for PR52171.
-This line, and those below, will be ignored--
M rewrite/tech.html.en
M rewrite/tech.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201455 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 13 Nov 2011 16:13:34 +0000 (16:13 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201450 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 13 Nov 2011 16:13:12 +0000 (16:13 +0000)]
speling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201449 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 13 Nov 2011 15:48:06 +0000 (15:48 +0000)]
add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections
behaves as expected instead of discarding previous sections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201443 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 01:07:37 +0000 (01:07 +0000)]
set svn:ignores
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201382 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 00:21:45 +0000 (00:21 +0000)]
libapreq is not a bunch of C files now, no special configure magic required
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201374 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 00:21:15 +0000 (00:21 +0000)]
remove leftovers from initial libapreq import
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201373 13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Sun, 13 Nov 2011 00:20:32 +0000 (00:20 +0000)]
As discussed at AC NA 2011
o relocate srclib/libapreq/library/*.c -> server/apreq_${f}.c
o relocate srclib/libapreq/include/*.h -> include/*.h
o remove apreq_version.[hc] related stuff since its nolonger its own lib
o connect modules/apreq to the build under 'most' default comment out in httpd.conf
o update make_exports.awk to handle APREQ marcos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201372 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 12 Nov 2011 23:42:45 +0000 (23:42 +0000)]
Server directive display (-L): Include directives of DSOs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201354 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 12 Nov 2011 21:24:47 +0000 (21:24 +0000)]
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/trunk@
1201331 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 19:13:44 +0000 (19:13 +0000)]
Set --enable-load-all-modules implicitely in
maintainer mode unless disabled explicitely.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201306 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 05:59:13 +0000 (05:59 +0000)]
Folloup on r1201158: New MaxMemFree was meant
to be 2048, not 4096.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201202 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 05:53:49 +0000 (05:53 +0000)]
Move the examples README from experimental to
examples. Correct some basic errors in the file.
No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201198 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 05:40:43 +0000 (05:40 +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/trunk@
1201194 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 12 Nov 2011 01:54:50 +0000 (01:54 +0000)]
Set MaxMemFree 2048 by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201158 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 12 Nov 2011 01:32:56 +0000 (01:32 +0000)]
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/trunk@
1201146 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 12 Nov 2011 00:12:50 +0000 (00:12 +0000)]
Change module sets and default activation status:
1) Promoted from "most" to "few"
- mod_headers
2) Demoted from "yes" 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" 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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201111 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 11 Nov 2011 20:22:08 +0000 (20:22 +0000)]
Use the right lua scope when used as a hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201042 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Fri, 11 Nov 2011 19:26:22 +0000 (19:26 +0000)]
Make doxygen generate (useful) graphs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201032 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 18:18:32 +0000 (18:18 +0000)]
Axes links to many grossly outdated resources. Adds more visible warning
about the state of the developer documentstion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1201009 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 11 Nov 2011 17:41:35 +0000 (17:41 +0000)]
replace most of the literal 2.2's with the major version entity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200984 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:30:56 +0000 (17:30 +0000)]
We're not 2.0 any more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200978 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 11 Nov 2011 17:30:18 +0000 (17:30 +0000)]
don't let thread-scope be selected in a server w/o threads
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200977 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 11 Nov 2011 17:27:06 +0000 (17:27 +0000)]
C99 and unused variable warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200975 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:19:02 +0000 (17:19 +0000)]
Rebuild doc transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200970 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:17:02 +0000 (17:17 +0000)]
A little clarification about variable interpolation, as requested in bug #51125
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200968 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:11:17 +0000 (17:11 +0000)]
Rebuild doc transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200963 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:09:28 +0000 (17:09 +0000)]
Clarify docs for LimitRequestLine, as per bug #51665.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200961 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:07:36 +0000 (17:07 +0000)]
Rebuild xdoc transform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200957 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 11 Nov 2011 17:06:40 +0000 (17:06 +0000)]
Patch from Luke Meyer, clarifies usage of ProxyPassReverseCookiePath directive. As per bug #51126
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200955 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 11 Nov 2011 03:01:33 +0000 (03:01 +0000)]
A stab at libapreq build integration, still disabled by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200715 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 11 Nov 2011 02:40:16 +0000 (02:40 +0000)]
Formatting, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200702 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 11 Nov 2011 02:32:19 +0000 (02:32 +0000)]
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1200699 13f79535 -47bb-0310-9956-
ffa450edef68