]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Guenter Knauf [Thu, 27 Dec 2007 23:59:11 +0000 (23:59 +0000)]
Add backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607142
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 25 Dec 2007 23:29:57 +0000 (23:29 +0000)]
Add backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606826
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Tue, 25 Dec 2007 00:28:47 +0000 (00:28 +0000)]
Rolled back as part of PR 43890
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606749
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 20:03:31 +0000 (20:03 +0000)]
Solve service status handle leak on multi-service ApacheMonitor
instances, and disconnect computer function on multi-system
applications of ApacheMonitor.
PR: 33803
Reported by: K.W.Schick <drax sawebs.com>
Backport: 606481
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606482
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 04:36:13 +0000 (04:36 +0000)]
Copy all missing modules/foo/xxx.h headers.
Backports: r606394
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606395
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 02:19:05 +0000 (02:19 +0000)]
Solve two ssl issues; always install both ab.exe and abs.exe
because it's easier to move around ab.exe when that's all
someone needs (and this is precisely how the binary installer
works, too), and also kindly ignore missing openssl tree files
because TIMTOWTDI (although this one is preferred :)
Backport: r606382, r606383
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606384
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 20:09:27 +0000 (20:09 +0000)]
Let the installer lead on the origin sourceroot conf path
Backport: r606293
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606294
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 19:18:33 +0000 (19:18 +0000)]
Quoting this made it worse on us, not easier.
Resolve SSLMutex default on win32.
Backports: r606274
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606275
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 18:46:54 +0000 (18:46 +0000)]
Kill proxy\ dir, a horrible name with no corresponding example
Backports: r606265
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606266
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 17:04:57 +0000 (17:04 +0000)]
The installer will now create a temp-extras directory
Backports: r606251
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606252
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 12:25:53 +0000 (12:25 +0000)]
However, we still won't want to load charset_lite by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606173
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 12:22:03 +0000 (12:22 +0000)]
Add charset lite missing from old config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606171
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:45:33 +0000 (11:45 +0000)]
Unplug win32 specific config, plug in build/installwinconf.awk
Backports: r606158
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606167
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:43:00 +0000 (11:43 +0000)]
Prepare for win32 to share the common config file.
Note the quotes for "logs/access_log" which let us
toggle this to access.log, while leaving the custom
log format specifier pretty_log alone.
Also, prefer the user specified port for example
ServerName directive.
Backports: r606135
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606166
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:39:43 +0000 (11:39 +0000)]
Copy with module list changes for 2.2 v.s. 2.x trunk module names.
Borrowing the msi installer script as a starting point, ensure
we use the same configuration rewrite engine for the msi and the
local build. Prepares us to share httpd.conf.in with all platforms.
Backport: r606136, 606156, 606157
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606164
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 20 Dec 2007 23:05:13 +0000 (23:05 +0000)]
Revert the senseless half of r605396, whitespace only change.
Noted by Ruediger, thanks for this catch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606050
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 20 Dec 2007 21:49:53 +0000 (21:49 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@606036
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 04:14:49 +0000 (04:14 +0000)]
Catch up to APR 1.2.12, which politely names the static
library pdb's the same as their correponding .lib's.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605415
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 03:08:42 +0000 (03:08 +0000)]
When building to WinNT, CommandLineToArgvW must resolve.
Backports r605397
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605399
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 03:02:57 +0000 (03:02 +0000)]
Handle args appropriately for an apr app.
Backports r605395
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605396
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 18 Dec 2007 21:55:45 +0000 (21:55 +0000)]
Sort
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605336
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 18 Dec 2007 03:46:48 +0000 (03:46 +0000)]
Two type mismatch fixes previously committed to trunk\
and forgotten from backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@605073
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 17 Dec 2007 17:49:46 +0000 (17:49 +0000)]
Correct statements in OPENSSL-README when building the
httpd+openssl binary.
Backport: r604940
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604944
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 15 Dec 2007 20:24:02 +0000 (20:24 +0000)]
update convmap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604504
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 15 Dec 2007 20:20:53 +0000 (20:20 +0000)]
activate LastChangedRevision keyword substitution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604501
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sat, 15 Dec 2007 18:08:11 +0000 (18:08 +0000)]
Update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604471
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sat, 15 Dec 2007 18:07:02 +0000 (18:07 +0000)]
'segement' typo and link to correct directive for lbmethod explanation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604470
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 15 Dec 2007 08:45:40 +0000 (08:45 +0000)]
* Rebuild documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604404
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 15 Dec 2007 08:42:11 +0000 (08:42 +0000)]
* Correctly terminate string in SSL client certificate extensions
parsing by ensuring that it always has a \0 at the end.
PR: PR 44073
Submitted by: yl <yl bee-ware.net>
Reviewed by: rpluem, jorton, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604403
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 14 Dec 2007 23:42:35 +0000 (23:42 +0000)]
simple mod_ssl fix (too bad about the pSTRNdup)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604332
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Dec 2007 13:46:43 +0000 (13:46 +0000)]
Merge r603346 from trunk:
http_protocol: Escape request method in 405 error reporting.
This has no security impact since the browser cannot be tricked
into sending arbitrary method strings.
(words from jorton)
Submitted by: trawick
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604192
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 14 Dec 2007 09:57:32 +0000 (09:57 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604141
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 13 Dec 2007 20:07:19 +0000 (20:07 +0000)]
* Propose a backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@604012
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 13 Dec 2007 17:34:39 +0000 (17:34 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603963
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 13 Dec 2007 15:58:37 +0000 (15:58 +0000)]
That would be good too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603944
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 13 Dec 2007 14:29:50 +0000 (14:29 +0000)]
eventually
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603924
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 12 Dec 2007 20:50:37 +0000 (20:50 +0000)]
Backport r602795: fix ajp buffer size.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603736
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 12 Dec 2007 20:43:04 +0000 (20:43 +0000)]
Backport r602735 and r602735
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603732
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 12 Dec 2007 20:36:31 +0000 (20:36 +0000)]
Vote&promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603729
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 12 Dec 2007 19:38:26 +0000 (19:38 +0000)]
Fix CVE-2007-5000:
* modules/mappers/mod_imagemap.c (menu_header): Fix
cross-site-scripting issue by escaping the URI, and ensure that a
charset parameter is sent in the content-type to prevent
autodetection by broken browsers.
Reported by: JPCERT
Backports: r603282
Submitted by: jorton
Reviewed by: rpluem, trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603711
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 12 Dec 2007 14:04:51 +0000 (14:04 +0000)]
+1, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603617
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 11 Dec 2007 21:16:21 +0000 (21:16 +0000)]
* Cast a vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603362
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Dec 2007 17:15:03 +0000 (17:15 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603306
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Dec 2007 17:12:23 +0000 (17:12 +0000)]
Propose CVE-2007-5000 fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603305
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 11 Dec 2007 12:57:50 +0000 (12:57 +0000)]
* Add two new proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603231
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 10 Dec 2007 21:07:58 +0000 (21:07 +0000)]
One more bit of trivia to compile mod_substitute on win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@603048
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 10 Dec 2007 11:18:45 +0000 (11:18 +0000)]
* Cast a vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602864
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 10 Dec 2007 11:04:33 +0000 (11:04 +0000)]
cast a vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602862
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Mon, 10 Dec 2007 07:58:22 +0000 (07:58 +0000)]
Propose r602795 for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602801
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Dec 2007 22:15:02 +0000 (22:15 +0000)]
* Update transformation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602741
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Dec 2007 22:10:55 +0000 (22:10 +0000)]
Merge r602736 from trunk:
* mod_substitute is no longer experimental.
Submitted by: rpluem
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602738
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 9 Dec 2007 18:39:06 +0000 (18:39 +0000)]
r582635 was an INCORRECT backport of r581117 (my fault).
This corrects the error, bringing it in line with 581117
and the vote that was taken on that release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602715
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 9 Dec 2007 18:13:30 +0000 (18:13 +0000)]
Make that two files that hadn't noticed the movement from experimental->filters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602711
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 9 Dec 2007 18:09:58 +0000 (18:09 +0000)]
Complete r602684 backporting win32 build from trunk of mod_substitute.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602708
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 9 Dec 2007 16:36:58 +0000 (16:36 +0000)]
Not experimental anymore...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602694
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Dec 2007 15:48:15 +0000 (15:48 +0000)]
* Formating.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602688
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Dec 2007 15:26:09 +0000 (15:26 +0000)]
* Update transformation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602685
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Dec 2007 15:19:40 +0000 (15:19 +0000)]
Backport mod_substitute from trunk:
mod_substitute: Added a new experimental output filter, which
performs inline response content pattern matching (including
regex) and substitution.
Submitted by: jim
Reviewed by: jim, rpluem, fuankg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602684
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Dec 2007 14:54:23 +0000 (14:54 +0000)]
Merge r480135, r480193, r504559, r602349, r602657, r503863 from trunk:
* Apply patch for PR 41056 (19954) to fix chunk
filter. Now flushes work better.
* Protect against any sort of non-block read that
would block. If ap_get_brigade() shows that, return
EAGAIN.
* Further refinement for PR41056 / PR 19954 (mostly-fixed in r480135.)
We assume that a successful read but an empty brigade
is NOT cause for EAGAIN. Testing may or may not
confirm this assumption, in which case that test
may be required as well.
* If no data is available at this point of time we need to switch into the
BODY_CHUNK_PART state like we do several lines later in the code in the
same situation.
* Case statements should go on their own line. (No functional change.)
* modules/http/http_filters.c
(ap_http_filter): Put case on its own line.
* Add missing Changelog entry for PR41056 / PR 19954. This was fixed in r480135.
PR: 41056 / 19954
Submitted by: jfclere, jim
Reviewed by: rpluem, jim, jerenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602679
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Dec 2007 14:46:56 +0000 (14:46 +0000)]
Merge r599589 from trunk:
* Detabify and make spacing in HTML code the same as before r593816. This
avoids that the autoindex test (t/modules/autoindex) fails. Adjusting
the autoindex test would cause it to fail with older versions and would
make it harder to recognize regressions.
Submitted by: rpluem
Reviewed by: rpluem, jim, fuankg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602678
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Sun, 9 Dec 2007 10:53:03 +0000 (10:53 +0000)]
Cast a vote for chunk non-block changes; move accepted backports to the
right section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602658
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 8 Dec 2007 23:40:09 +0000 (23:40 +0000)]
added comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602578
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 8 Dec 2007 23:01:27 +0000 (23:01 +0000)]
Cast some votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602573
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 8 Dec 2007 21:27:37 +0000 (21:27 +0000)]
Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602551
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 19:33:47 +0000 (19:33 +0000)]
Merge r589461, r602491 from trunk:
Prevent 1-byte overflow on 8192 boundary (see PR 43310)
Alternate fix... profiling indicates that the string
termination is completely unneeded and superflous. In
which case, the original allocation size is sufficient
since nothing external worries about a NULL nor
looks for it.
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602536
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 19:32:40 +0000 (19:32 +0000)]
Merge r574201, r574684 from trunk:
* Also set the Vary header if a rewrite condition is true and uses a HTTP
header, but all remaining rewrite conditions are skipped due to the [OR]
flag.
* Add the novary flag to RewriteCond in order to prevent the appending
of HTTP headers used in a rewrite condition to the Vary header of
the response.
Submitted by: rpluem
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602535
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 18:57:31 +0000 (18:57 +0000)]
Latest patch folds in rpluem's v. nice tunings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602530
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 8 Dec 2007 18:55:44 +0000 (18:55 +0000)]
Vote&promote some more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602528
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 8 Dec 2007 16:59:08 +0000 (16:59 +0000)]
Merge 590641 from trunk:
Add in SeeRequestTail directive, to handle the shortcoming
of only storing 63 bytes of the request, when the requests
are longer than that and only vary towards the end; eg:
GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/apples.jpg
GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/pears.jpg
GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/plums.jpg
Submitted by: jim
Reviewed by: jim, rpluem, niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602508
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 8 Dec 2007 16:50:12 +0000 (16:50 +0000)]
Merge r517238, r517654 from trunk:
Generate etags consistently across 32-bit and 64-bit platforms:
* modules/http/http_etag.c (etag_uint64_to_hex): Renamed from
etag_ulong_to_hex; take an apr_uint64_t argument.
(ap_make_etag): Adjust to use new function and macro names.
Pass arguments directly to etag_uint64_to_hex without casting
down to unsigned long.
* modules/http/http_etag.c (etag_uint64_to_hex): Fix maximum shift
size, thanks to Ruediger.
PR: 40064
Submitted by: jorton
Reviewed by: rpluem, jim, niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602503
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 8 Dec 2007 16:45:02 +0000 (16:45 +0000)]
* Cast a vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602501
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 16:12:50 +0000 (16:12 +0000)]
Propose alternate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602493
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 8 Dec 2007 15:44:54 +0000 (15:44 +0000)]
Vote, promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602485
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 8 Dec 2007 14:26:46 +0000 (14:26 +0000)]
* Adjust comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602476
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 14:08:32 +0000 (14:08 +0000)]
Merge r600645 from trunk:
http_protocol: Escape request method in 413 error reporting.
Determined to be not generally exploitable, but a flaw in any case.
PR: 44014
Submitted by: Victor Stinner <victor.stinner inl.fr>
Submitted by: wrowe
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602473
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 14:07:25 +0000 (14:07 +0000)]
Merge r598299, r599393 from trunk:
mod_filter: don't segfault on (unsupported) chained FilterProviders.
PR 43956
Since we don't support chained filters, and can't expect to while the
filter_init problem remains, we should make it clear to users at startup time.
Submitted by: niq
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602472
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 14:05:12 +0000 (14:05 +0000)]
Merge r598019 from trunk:
enable to build with OpenSSL 0.9.9
Submitted by: fuankg
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602471
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 14:04:34 +0000 (14:04 +0000)]
* http_filters: Fix handling of unrecognised Transfer Encodings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602470
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 14:01:47 +0000 (14:01 +0000)]
* mod_proxy_http: Correctly forward unexpected interim (HTTP 1xx) responses
incorporating ap_send_interim_response core API
PR 16518
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602468
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 13:59:22 +0000 (13:59 +0000)]
* core log.c: Work around possible solutions rejected by apr for
the old implementation of apr_proc_create(), and explicitly pass
the output and error channels to all log processes created.
This goes all the way back to piped logs failing to run on win32.
Not in or needed at trunk/, as apr 1.3.0 has the proper fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602467
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 13:58:16 +0000 (13:58 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602466
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Dec 2007 13:55:59 +0000 (13:55 +0000)]
Cast away :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602465
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 8 Dec 2007 12:48:56 +0000 (12:48 +0000)]
merge readability tweak from trunk r602456
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602457
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 8 Dec 2007 09:51:14 +0000 (09:51 +0000)]
* Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602439
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 7 Dec 2007 19:06:07 +0000 (19:06 +0000)]
fixed include path to use forward slash.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602181
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Dec 2007 18:55:58 +0000 (18:55 +0000)]
Rebuild HTML from XML changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602177
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 7 Dec 2007 18:26:09 +0000 (18:26 +0000)]
Provide a recipe description, (from the 2.0 docs) and make the recipe match the
description.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602173
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Thu, 6 Dec 2007 07:16:34 +0000 (07:16 +0000)]
Update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@601637
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Thu, 6 Dec 2007 07:16:14 +0000 (07:16 +0000)]
Merge r601634 from trunk (Language fixes, courtesy of Lucien Gentis)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@601636
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Wed, 5 Dec 2007 16:17:55 +0000 (16:17 +0000)]
Update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@601389
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Wed, 5 Dec 2007 16:14:30 +0000 (16:14 +0000)]
'Bodys' typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@601387
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 5 Dec 2007 09:38:24 +0000 (09:38 +0000)]
* This one is now backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@601273
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 5 Dec 2007 09:37:23 +0000 (09:37 +0000)]
* Merge r551099 from trunk:
mod_proxy_balancer: Remove the broken attempt to change balancer
params on-the-fly via the admin manager.
Submitted by: jfclere
Reviewed by: jim, rpluem, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@601272
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 3 Dec 2007 20:10:24 +0000 (20:10 +0000)]
* Cast a vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@600654
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 3 Dec 2007 20:06:47 +0000 (20:06 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@600652
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 3 Dec 2007 19:57:01 +0000 (19:57 +0000)]
Four different indentions? Normalize this, and add PR 44014 to the list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@600649
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 3 Dec 2007 15:56:46 +0000 (15:56 +0000)]
vote early and often
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@600576
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 3 Dec 2007 11:00:26 +0000 (11:00 +0000)]
* Withdraw my comment / objection as I cannot follow my own arguments during
a second review. Case I missed one dup2 call on the way what lead to my
initial comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@600475
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 2 Dec 2007 22:24:02 +0000 (22:24 +0000)]
Backport mod_include access checking (r571872,571927,572136)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@600393
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sun, 2 Dec 2007 05:38:23 +0000 (05:38 +0000)]
Update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@600248
13f79535 -47bb-0310-9956-
ffa450edef68