Greg Ames [Fri, 13 Jul 2007 19:23:24 +0000 (19:23 +0000)]
don't need the definitions for error buckets any more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556113
13f79535-47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 13 Jul 2007 18:05:46 +0000 (18:05 +0000)]
rev 556028 / 554011 to mod_deflate are externally visible, so mention it
in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556082
13f79535-47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 13 Jul 2007 15:11:16 +0000 (15:11 +0000)]
* generalize from error buckets to metadata buckets
* also applicable to the deflate input filter
* pass along metadata buckets rather than giving up mid-stream
vastly improved by: Rüdiger Plüm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556028
13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 12 Jul 2007 14:00:33 +0000 (14:00 +0000)]
Remove dead macros for certificate types that are already replaced by
APR-prefixed versions in apr-util (apr_ldap_option.h).
Submitted by: David Jones
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555629
13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 12 Jul 2007 02:42:44 +0000 (02:42 +0000)]
This data is passed in an unsafe way to the LDAP SDK if the compiler
chooses to use shorts for the enum values.
http://www.redbooks.ibm.com/redbooks/SG245992/nn4/SG245992_88.html
Submitted by: David Jones
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555470
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Thu, 12 Jul 2007 02:20:53 +0000 (02:20 +0000)]
Remove unneeded -I in apr_memcache test, since _INCLUDES already includes them on the paths
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555463
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Thu, 12 Jul 2007 02:06:01 +0000 (02:06 +0000)]
Fix VPATH builds of httpd with the apr_memcache backend for ssl sessions, when APR and APR-Util are also in a VPATH. This is caused by APR_INCLUDEDIR actually having multiple paths in a VPATH builds, so we need to use _INCLUDES instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@555458
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 10 Jul 2007 09:53:36 +0000 (09:53 +0000)]
Fill notes "session-sticky" and subprocess_env "BALANCER_SESSION_STICKY"
correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@554892
13f79535-47bb-0310-9956-
ffa450edef68
Tony Stevenson [Mon, 9 Jul 2007 17:45:50 +0000 (17:45 +0000)]
Added html.en -> for Aaron Crane's patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@554718
13f79535-47bb-0310-9956-
ffa450edef68
Tony Stevenson [Mon, 9 Jul 2007 17:42:40 +0000 (17:42 +0000)]
Typo -> Patch from Aaron Crane -> July 9th 2007.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@554716
13f79535-47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 6 Jul 2007 19:36:30 +0000 (19:36 +0000)]
with LimitRequestBody xxx and the deflate output filter configured, mod_deflate
eats the 413 error bucket, a 500 error is logged, and a blank screen appears
at the browser.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@554011
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 5 Jul 2007 17:10:43 +0000 (17:10 +0000)]
reverted r553031 since it breaks Linux/Unix platform builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@553563
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 4 Jul 2007 01:03:48 +0000 (01:03 +0000)]
changed error message to use APU_DBD_DRIVER_FMT for correct driver name;
removed platform ifdefs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@553031
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 3 Jul 2007 23:40:48 +0000 (23:40 +0000)]
ignore OpenSSL files copy error if files are not present.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@553021
13f79535-47bb-0310-9956-
ffa450edef68
Sander Temme [Tue, 3 Jul 2007 23:02:32 +0000 (23:02 +0000)]
Use correct Doxygen keywords for functions and variables. TODO: figure out whether those keywords are actually necessary. HTML-ify some documentation comments for benefit of Doxygen.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@553013
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jul 2007 18:13:27 +0000 (18:13 +0000)]
Rename relatively useless struct element for something more
defining. Also, if we were unable to ap_queue_push(), then
push2worker should report failure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@552937
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 2 Jul 2007 09:03:35 +0000 (09:03 +0000)]
Arrange the ping/pong explainations.
Submitted by Vincent Bray <noodlet gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@552436
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 29 Jun 2007 20:54:01 +0000 (20:54 +0000)]
* server/mpm/prefork/prefork.c (child_main): Stop processing new
connections if shutdown_pending is set, i.e. when SIGTERM is received
in single-proecss mode.
Submitted by: Garrett Rooney <rooneg apache.org>
PR: 38848
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@552029
13f79535-47bb-0310-9956-
ffa450edef68
Tony Stevenson [Fri, 29 Jun 2007 20:20:01 +0000 (20:20 +0000)]
PR 42114 : Patch originally submitted by Takashi Sato
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@552021
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Fri, 29 Jun 2007 16:08:24 +0000 (16:08 +0000)]
Fix the warning:
mod_proxy.c:284: warning: passing argument 1 of 'ap_strchr' discards qualifiers from pointer target type
Thanks Joe for catch it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551935
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 29 Jun 2007 13:28:58 +0000 (13:28 +0000)]
getpgid() returns a pid_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551889
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 29 Jun 2007 10:33:14 +0000 (10:33 +0000)]
Add alternative fixes for CVE-2007-3304:
* configure.in: Check for getpgid.
* include/mpm_common.h (ap_mpm_safe_kill): New prototype.
* server/mpm_common.c (reclaim_one_pid): Ensure pid validity before
calling apr_proc_wait().
(ap_mpm_safe_kill): New function.
* server/mpm/prefork/prefork.c, server/mpm/worker/worker.c,
server/mpm/experimental/event/event.c: Use ap_mpm_safe_kill() on pids
from the scoreboard, throughout.
* include/ap_mmn.h: Minor bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551843
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 29 Jun 2007 09:31:11 +0000 (09:31 +0000)]
Revert r547987 ("svn merge -c -547987 .")
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551835
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 29 Jun 2007 09:13:36 +0000 (09:13 +0000)]
* modules/metadata/mod_mime_magic.c: Constify some constant data.
(magic_rsl_puts, magic_rsl_add): Update accordingly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551831
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 29 Jun 2007 08:43:29 +0000 (08:43 +0000)]
* server/mpm/prefork/prefork.c (reap_children),
* server/mpm_common.c (ap_wait_or_timeout): Remove dead code; NEED_WAITPID
has never been defined by the 2.x build system.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551823
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 28 Jun 2007 01:35:20 +0000 (01:35 +0000)]
enabled ports settable for NetWare install.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551424
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 28 Jun 2007 00:21:18 +0000 (00:21 +0000)]
introduced independent var since we can build mod_ssl with both BSD and WINSOCK.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551413
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 27 Jun 2007 19:05:55 +0000 (19:05 +0000)]
added openssl files to the installation directory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551275
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 27 Jun 2007 18:10:31 +0000 (18:10 +0000)]
added blank line at the end
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551253
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 27 Jun 2007 18:01:37 +0000 (18:01 +0000)]
enabled setting awk tool from NWGNUenvironment.inc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551251
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 27 Jun 2007 15:25:36 +0000 (15:25 +0000)]
added mod_ssl to httpd.conf for BSD socket build;
some more fixes to httpd-ssl.conf; sync'd with r515403.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551196
13f79535-47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 27 Jun 2007 13:40:19 +0000 (13:40 +0000)]
Block ap_pid_table create with same define as used in mpm_common.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551163
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 27 Jun 2007 11:39:03 +0000 (11:39 +0000)]
Don't display "PHPSESSIONID | PHPSESSIONID" but only
"PHPSESSIONID".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551126
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 27 Jun 2007 08:42:02 +0000 (08:42 +0000)]
Remove the balancer modification logic of balancer-manager
because it can't work. And add the sticky_path to the
sticky display.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551099
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 27 Jun 2007 08:39:06 +0000 (08:39 +0000)]
Add the missing minor bump of r550519.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551097
13f79535-47bb-0310-9956-
ffa450edef68
Sander Temme [Mon, 25 Jun 2007 23:22:30 +0000 (23:22 +0000)]
Complete cleanup of global variable use by mod_example. This should take away
any existing reservation about thread-safety of this code. Add warning that
this code is now too top heavy and implements too many obscure callbacks to
serve a s point of departure for one's own development effort.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@550636
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 25 Jun 2007 14:42:25 +0000 (14:42 +0000)]
Add sticky_path to solve PR41897.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@550519
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 25 Jun 2007 14:29:54 +0000 (14:29 +0000)]
Fix the timeout logic. The order is now:
1 - worker->timeout
2 - proxy_conf->timeout
3 - server->timeout.
ap_get_module_config() is not perfect by that is easy to port back to 2.2.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@550514
13f79535-47bb-0310-9956-
ffa450edef68
Tony Stevenson [Mon, 25 Jun 2007 13:57:50 +0000 (13:57 +0000)]
Missing <br /> to wrap text correctly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@550504
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 21 Jun 2007 08:01:30 +0000 (08:01 +0000)]
Improve traces in ap_proxy_http_process_response().
That will help to investigate PR 37770. (errors from backend :-)).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549420
13f79535-47bb-0310-9956-
ffa450edef68
Mark J. Cox [Thu, 21 Jun 2007 07:41:02 +0000 (07:41 +0000)]
This issue now has a CVE name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549417
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 20 Jun 2007 19:32:49 +0000 (19:32 +0000)]
* Remove unused variables from set_define() function to fix a compiler warning.
Submitted by: Geoffrey Young <geoff modperlcookbook.org>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549207
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 20 Jun 2007 19:16:00 +0000 (19:16 +0000)]
* Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549198
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 20 Jun 2007 17:29:24 +0000 (17:29 +0000)]
Fix CVE-2006-5752:
* modules/generators/mod_status.c (status_handler): Specify charset in
content-type to prevent browsers doing charset "detection", which
allows an XSS attack. Use logitem-escaping on the request string to
make it charset-neutral.
Reported by: Stefan Esser <sesser hardened-php.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549159
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 20 Jun 2007 15:32:28 +0000 (15:32 +0000)]
* docs/manual/developer/output-filters.xml: Fix grammar.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549138
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 20 Jun 2007 15:30:39 +0000 (15:30 +0000)]
* .gdbinit: Add a few useful macros, and set defaults
for signal handling appropriate for httpd debugging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549136
13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 20 Jun 2007 15:27:08 +0000 (15:27 +0000)]
Tweak text for PR 39245 fix; handling of 1xx interim responses is
not affected by this change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549131
13f79535-47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Sun, 17 Jun 2007 07:21:08 +0000 (07:21 +0000)]
PR 31978, submitted by Ryan Morgan, resubmitted by Tony Stevenson.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@548014
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 16 Jun 2007 21:29:24 +0000 (21:29 +0000)]
PID table impl: parent process keeps a local table store of
Apache child process PIDs and uses that to check validity
of what's in the scoreboard.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@547987
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 13 Jun 2007 02:41:09 +0000 (02:41 +0000)]
Rather than handling lingering closes inline, fall down to a following if block, which handles them correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546715
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 13 Jun 2007 02:18:59 +0000 (02:18 +0000)]
Improve mc_session_id2sz as suggested by Rüdiger.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546708
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 13 Jun 2007 02:10:04 +0000 (02:10 +0000)]
Make default values for memcache config defines, rather than inline constants.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546707
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 12 Jun 2007 22:24:42 +0000 (22:24 +0000)]
Add the 'Define' command to the core. This does exactly the same thing as adding a -D FOO to your command line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546651
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 12 Jun 2007 22:21:17 +0000 (22:21 +0000)]
Adding the clogging input filters patch was a minor MMN bump
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546650
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 12 Jun 2007 20:55:57 +0000 (20:55 +0000)]
Fixup style nitpicks:
- Empty lines should not have spaces
- Declare static functions in http_core.c at the top.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546632
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 12 Jun 2007 00:32:24 +0000 (00:32 +0000)]
Add a clogging_input_filters variable to the conn_rec, enabling the Event MPM to know when its running with an input filter that buffers its own data, like mod_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546328
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Tue, 12 Jun 2007 00:29:17 +0000 (00:29 +0000)]
Fix a bug in the use of i2d_SSL_SESSION, since it increments the pointer of the buffer passed, we need to use ucaData rather than ucp to put it into memcache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546326
13f79535-47bb-0310-9956-
ffa450edef68
Joshua Slive [Mon, 11 Jun 2007 18:53:14 +0000 (18:53 +0000)]
I doubt adding a newline to the end of the file
is going to hurt anyone.
PR: 42615
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546221
13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 11 Jun 2007 12:40:37 +0000 (12:40 +0000)]
Arrange the proxy timeout behaviour.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546128
13f79535-47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Mon, 11 Jun 2007 06:22:41 +0000 (06:22 +0000)]
Various out-of-date translation version diffs, and a .meta.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546024
13f79535-47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Sun, 10 Jun 2007 04:57:36 +0000 (04:57 +0000)]
Update to include RFC 4346, TLS protocol version 1.1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545845
13f79535-47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Sun, 10 Jun 2007 04:39:22 +0000 (04:39 +0000)]
Patch submitted by Tony Stevenson, modifications by myself.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545841
13f79535-47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Sun, 10 Jun 2007 03:14:42 +0000 (03:14 +0000)]
Fix a typo, as per PR 40447.
Submitted by Tony Stevenson.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545834
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 8 Jun 2007 20:18:17 +0000 (20:18 +0000)]
For the DBM SSL Session Cache, propogate down pools to use for allocations. In most cases, we can use the conn_rec::pool, but for ssl_callback_DelSessionCacheEntry, we still use the long lived configuration pool, but this change at least makes it easier to fix in the future.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545610
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 8 Jun 2007 20:04:34 +0000 (20:04 +0000)]
Propogate the conn_rec::pool down to ssl_scache_retrieve so that the memcache layer doesn't 'leak' into a long lived pool for temp allocations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545608
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 8 Jun 2007 16:00:14 +0000 (16:00 +0000)]
Fix error mesage for when a user trys to use memcache, but support is not available.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545538
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 8 Jun 2007 03:30:05 +0000 (03:30 +0000)]
Increment the enum correctly.
Noticed By: Ryan Phillips
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545392
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 8 Jun 2007 03:17:41 +0000 (03:17 +0000)]
Use the absolute timeout, as provided by mod_ssl, rather than trying to calculate a relative timeout. (which did it wrong anyways).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545385
13f79535-47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 8 Jun 2007 02:48:04 +0000 (02:48 +0000)]
Add support for distributed caching of SSL Sessions inside memcached, using apr_memcache, which is present in APR-Util 1.3/trunk.
This was originally written at ApacheCon US 2005 (San Diego), and was sent to the list:
http://mail-archives.apache.org/mod_mbox/httpd-dev/200512.mbox/%
3C439C6C07.
9030904@force-elite.com%3E
This version is slightly cleaned up, and of course, uses the now bundled apr_memcache, rather than an external dependency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@545379
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 6 Jun 2007 20:02:56 +0000 (20:02 +0000)]
* Preset the form fields for route and redirect with the values of the active
configuration in the scoreboard and not with the ones loaded from the
configuration files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@544930
13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 1 Jun 2007 15:50:12 +0000 (15:50 +0000)]
SECURITY: CVE-2007-1862 (cve.mitre.org)
mod_mem_cache: Copy headers into longer lived storage; header names and
values could previously point to cleaned up storage
PR: 41551
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@543515
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 27 May 2007 13:57:46 +0000 (13:57 +0000)]
* Prevent running through the error stack by returning OK and setting r->status
accordingly if ret is HTTP_NOT_MODIFIED as this breaks mod_cache validating a
stale entity.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541990
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 27 May 2007 11:26:04 +0000 (11:26 +0000)]
* Also add a possible ETag header to r->headers_out. We need to have it there
for our later call to ap_meets_conditions a few lines above. Having it put
in the merge table will fail as merge and r->err_headers_out get merged
AFTER our call to ap_meets_conditions. Besides of this having multiple
ETag headers (or a merged version of them) does not seem to make sense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541974
13f79535-47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 26 May 2007 18:50:18 +0000 (18:50 +0000)]
PR#39710 - badly broken errordocuments for CGI
We've just had another duplicate report of this on bugzilla.
We've got a simple patch, and people asking WTF is going on
with inaction. Noone seems clear on why the patch shouldn't
be applied (http://marc.info/?l=apache-httpd-dev&m=
117760311129386&w=2).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541926
13f79535-47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 25 May 2007 15:11:46 +0000 (15:11 +0000)]
Adds an example using multiple file extensions, to answer a
frequently-asked (IRC) question that came up yet again today.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541685
13f79535-47bb-0310-9956-
ffa450edef68
Sander Temme [Thu, 24 May 2007 02:19:04 +0000 (02:19 +0000)]
Explain that POST data should be sent as the correct MIME type.
Submitted by Vincent Bray noodlet at gmail dot com,
edited and reviewed by sctemme
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@541138
13f79535-47bb-0310-9956-
ffa450edef68
Chris Darroch [Sat, 19 May 2007 05:01:44 +0000 (05:01 +0000)]
apr_dbd_check_conn() just returns APR_SUCCESS or APR_EGENERAL, so we
don't actually have a driver-specific value to pass to apr_dbd_error(),
but that's OK because most/all drivers just ignore this value anyway
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539687
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Fri, 18 May 2007 22:42:59 +0000 (22:42 +0000)]
mod_cache: Do not set Date or Expires when they are missing from the original
response or are invalid.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539621
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Fri, 18 May 2007 22:38:08 +0000 (22:38 +0000)]
mod_cache: Correctly handle HEAD requests on expired cache content. PR 41230.
* modules/cache/mod_cache.c
(cache_save_filter): Properly handle HEAD responses when we have a stale handle.
(This patch was revised by Justin/Ruediger.)
Submitted by: Niklas Edmundsson
Reviewed by: Justin, Ruediger
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539620
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 May 2007 12:43:55 +0000 (12:43 +0000)]
Document new directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539433
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 May 2007 12:41:52 +0000 (12:41 +0000)]
Backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539431
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Fri, 18 May 2007 06:15:11 +0000 (06:15 +0000)]
Sync with 2.2.5 CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539282
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 17 May 2007 21:16:56 +0000 (21:16 +0000)]
* Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539119
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 17 May 2007 18:25:13 +0000 (18:25 +0000)]
mod_cache: Let Cache-Control max-age set the expiration of the cached
representation if Expires is not set.
* modules/cache/mod_cache.c
(cache_save_filter): If Cache-Control max-age is set and Expires isn't,
let that value control our expiration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539063
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 17 May 2007 18:17:23 +0000 (18:17 +0000)]
mod_disk_cache: If the Vary'd content is stale, we can handle it via our
freshness tests which will attempt to revalidate the content.
* modules/cache/mod_disk_cache.c
(open_entity): If the root Vary index is stale, we don't need to throw away
potentially stale content - we can try to refresh it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@539054
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 17 May 2007 16:20:06 +0000 (16:20 +0000)]
mod_disk_cache: When renegotiating an already cached Vary'd response, do not
let us later throw away the renegotiated content due to a name mismatch.
We do not need to update the ->name field just before writing the headers as
the computed ->name on open and create is sufficient. Updating ->name here is
essentially a no-op - except in the case of Vary where the key has internally
changed (to account for the Vary prefix), but the original name has not.
However, writing the Vary'd-accounted key means that when we read the cache
next that we will error out and disregard the just renegotiated response and
fetch the content all over again - oops!
(This is largely a case where I think we may have overthought ourselves; hence
the explanation is here in the commit rather than in the file itself.)
* modules/cache/mod_disk_cache.c
(store_headers): The originally opened ->name is sufficient.
* CHANGES: Combined with r538992, note that renegotiation for Vary's seem to
work far better.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538997
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 17 May 2007 16:10:29 +0000 (16:10 +0000)]
mod_disk_cache: When renegotiating an already cached Vary'd response, create
the refreshed .vary structure in the right directory. Otherwise, we'll create
a new .vary layout underneath the already existing one - oops!
* modules/cache/mod_disk_cache.c
(store_headers): Temporarily clear dobj->prefix if it is set to ensure that
we create the .vary structure underneath the cache root.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538992
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 17 May 2007 10:59:31 +0000 (10:59 +0000)]
* Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538869
13f79535-47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 17 May 2007 05:43:18 +0000 (05:43 +0000)]
RFC 2616 13.2.1 calls out max-age as being a valid 'explicit expiration time',
so per Sec. 13.9 permit queries with just max-age instead of only Expires.
* modules/cache/mod_cache.c
(cache_save_filter): Be closer to RFC 2616's intent for query arguments.
* CHANGES: Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@538807
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 13 May 2007 15:29:06 +0000 (15:29 +0000)]
Doccos update... sync up to current time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537600
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 13 May 2007 15:28:29 +0000 (15:28 +0000)]
Fold in ProxyPassMatch directive with docs. Support
full regex substitution but also allow for "simple"
cases (ala JkMount) to work as well.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537599
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 12 May 2007 14:12:24 +0000 (14:12 +0000)]
Add regex pattern matching to ProxyPass, allowing,
for example:
ProxyPass ~ \.gif balancer://imagecluster
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537429
13f79535-47bb-0310-9956-
ffa450edef68
Mladen Turk [Tue, 8 May 2007 04:45:54 +0000 (04:45 +0000)]
Add detection for post XP operating systems.
Think this can be safely backported to 2.2 and 2.0 branches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@536052
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 7 May 2007 15:37:36 +0000 (15:37 +0000)]
* Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535907
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 7 May 2007 14:20:09 +0000 (14:20 +0000)]
- In AP_MODE_SPECULATIVE ap_core_input_filter returns APR_SUCCESS and an empty
brigade in the case that a non blocking read from the socket returned
APR_EAGAIN. So getting an empty brigade also shows that no data is present
in the input filter.
While this reduces the number of false positives for "real data" in the input
filter the behaviour is not as good as before 533820 because if there are
only CRLF's in the input filter we do not flush, but we should. To fix this
it seems that a simulation of AP_MODE_EATCRLF is needed inside of
check_pipeline.
- Destroy brigade bb at the end of the function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535879
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 6 May 2007 14:35:02 +0000 (14:35 +0000)]
* Prevent a segmentation fault if one of the Cache-Control headers
s-maxage, max-age, min-fresh, max-stale has no value assigned.
In this case ignore s-maxage, max-age, min-fresh. For max-stale
it is valid to set no value. In this case set max-stale to 1 year
to signal that the client is accepting a stale response of any age.
Submitted by: Niklas Edmundsson <nikke acc.umu.se>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535617
13f79535-47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 4 May 2007 20:12:46 +0000 (20:12 +0000)]
the problem with Event and mod_ssl was fixed with rev. 533820. I'm not
aware of problems with other input filters that aren't addressed in that fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535370
13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 4 May 2007 19:12:38 +0000 (19:12 +0000)]
Abstract out (kinda) MSG_PEEK. This way when we
actually update APR and apr_socket_recvfrom()
to know about APR_MSG_OOB, APR_MSG_PEEK, etc...
this code won't need to be adjusted. Also,
make nicer for 2.2 backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535354
13f79535-47bb-0310-9956-
ffa450edef68
Joshua Slive [Fri, 4 May 2007 14:13:42 +0000 (14:13 +0000)]
As discussed on docs@httpd, remove the FAQ and replace it with the contents
of the old support.xml and a pointer to the wiki.
Of possible interest: I've also removed the link to the professional support
database, since it was returning error 500 for some time and nobody
seemed to care.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535248
13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 4 May 2007 11:11:26 +0000 (11:11 +0000)]
* Add extern "C" linkage to several headers to make it easier to use
them in C++ code.
PR: 42286
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@535169
13f79535-47bb-0310-9956-
ffa450edef68