]>
granicus.if.org Git - apache/log
Joshua Slive [Tue, 31 Jul 2007 19:17:09 +0000 (19:17 +0000)]
Move dir2 over to folder2 also for consistency. (These are never used anywhere.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@561448
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Tue, 31 Jul 2007 19:16:23 +0000 (19:16 +0000)]
conf/extra/httpd-autoindex.conf references folder.gif, not dir.gif, so
change the names here.
PR: 33508
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@561446
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Tue, 31 Jul 2007 14:54:46 +0000 (14:54 +0000)]
this appears to be a "mv" rather than a "swap", so we should be able to
simplify & shave off a couple of cycles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@561352
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 30 Jul 2007 12:30:36 +0000 (12:30 +0000)]
Be liberal in what we accept. Where it matters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560941
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 30 Jul 2007 12:24:49 +0000 (12:24 +0000)]
Be liberal and correct in what we accept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560937
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 29 Jul 2007 20:47:44 +0000 (20:47 +0000)]
Update r560689 following rpluem's analysis thereof.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560811
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 29 Jul 2007 08:35:56 +0000 (08:35 +0000)]
Fix protocol handling in mod_deflate input filter
PR 23287
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560689
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 28 Jul 2007 12:21:14 +0000 (12:21 +0000)]
PR: 40299 Registered Javascript/ECMAScript MIME types (RFC4329)
PR: 40379 Apple installer registered type
Comment: "dist" and "pkg" are too widely used to reserve.
Not sure if they could be overloaded in the context of "extension"s?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560533
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Fri, 27 Jul 2007 20:34:41 +0000 (20:34 +0000)]
mod_ldap, mod_authnzldap: Add support for nested groups (i.e. the ability
to authorize an authenticated user via a "require ldap-group X" directive
where the user is not in group X, but is in a subgroup contained in X.
PR 42891 [Paul J. Reder]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@560373
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 26 Jul 2007 21:41:43 +0000 (21:41 +0000)]
Rationalisation suggested by rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559999
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 26 Jul 2007 21:22:57 +0000 (21:22 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559987
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 26 Jul 2007 21:18:00 +0000 (21:18 +0000)]
remove linebreak which causes a bogus anchor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559983
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Thu, 26 Jul 2007 20:51:23 +0000 (20:51 +0000)]
PR 41334. Replaced apache, with httpd as the binary name.
Thanks Brett
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559969
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 26 Jul 2007 14:53:25 +0000 (14:53 +0000)]
Note mod_filter fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559840
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 26 Jul 2007 14:48:48 +0000 (14:48 +0000)]
Fix integer comparisons in mod_filter
PR: 41835
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559837
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 26 Jul 2007 13:21:20 +0000 (13:21 +0000)]
mod_filter: fix merging of ! and =
PR: 42186 - patch by Issac Goldstand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559804
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Thu, 26 Jul 2007 08:35:43 +0000 (08:35 +0000)]
Build artifacts
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559752
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Thu, 26 Jul 2007 08:32:23 +0000 (08:32 +0000)]
Link to filters page to address PR35102
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559748
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 25 Jul 2007 17:04:16 +0000 (17:04 +0000)]
Correctly reference the FilesMatch directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559523
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 25 Jul 2007 16:22:24 +0000 (16:22 +0000)]
An example of using the [T] flag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559511
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 25 Jul 2007 15:38:14 +0000 (15:38 +0000)]
Fix rewriterule directive, as per comment #9 in
http://issues.apache.org/bugzilla/show_bug.cgi?id=40004
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559494
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Tue, 24 Jul 2007 10:54:35 +0000 (10:54 +0000)]
[PR36917] Document pre-2.2.4 behaviour of mod_dumpio
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@559006
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 23 Jul 2007 21:11:50 +0000 (21:11 +0000)]
rebuild everything
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558862
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 23 Jul 2007 21:06:31 +0000 (21:06 +0000)]
fix eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558860
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Mon, 23 Jul 2007 19:23:24 +0000 (19:23 +0000)]
Address PR42898 by qualifying the value of Pattern for RewriteRule, and later explaining how to snarf the rest of the request url. (and the usual build detritus).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558837
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Mon, 23 Jul 2007 13:31:19 +0000 (13:31 +0000)]
Demote use of AddType for cgi and remove redundant paragraph regarding DOCUMENT_ROOT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558718
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Mon, 23 Jul 2007 12:03:33 +0000 (12:03 +0000)]
Typo (wilcard) in LocationMatch.
Sync build output (outdated markers) from the previous few commits.
Couple of minor language adjustments.
Commit build of recent ap_regcomp/ap_regexec fix in new_features_2_2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558694
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Mon, 23 Jul 2007 11:28:37 +0000 (11:28 +0000)]
Undocument 1.3 quoting behaviour for ErrorDocument.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558686
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Mon, 23 Jul 2007 08:24:06 +0000 (08:24 +0000)]
Explain that ? and * don't match / in Location regexen, submitted by Eric
Covener Sept 23, '06
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558651
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Mon, 23 Jul 2007 07:33:44 +0000 (07:33 +0000)]
Fix title per docs@ thread "Typo in /caching.html" 12 June '06
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558634
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Mon, 23 Jul 2007 07:17:22 +0000 (07:17 +0000)]
Reword description of matching NVH with VH, per docs@, subject "NameVirtualHost
and <VirtualHost>" June 12, 2006.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558629
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sun, 22 Jul 2007 13:50:16 +0000 (13:50 +0000)]
Language fix submitted by Lucien Gentis to docs@
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558483
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sun, 22 Jul 2007 08:20:07 +0000 (08:20 +0000)]
Typo fix. s/proxys/proxies/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558468
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 21 Jul 2007 20:46:02 +0000 (20:46 +0000)]
close directory blocks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558381
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 20 Jul 2007 20:54:29 +0000 (20:54 +0000)]
* We need to supply a (char *) to ap_str_tolower not a char.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558133
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 20 Jul 2007 16:20:10 +0000 (16:20 +0000)]
the cost of synchronized SMP proof updates far outweighs the value of having
100% accurate MaxRequestsPerChild.
* it doesn't even count requests, it counts connections.
* all it is is a number someone pulls out of a hat in an attempt to deal with
resource leaks.
i.e., no strong need for accuracy.
atomic operations are relatively expensive and this is mainline code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@558039
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 20 Jul 2007 11:56:36 +0000 (11:56 +0000)]
Fix clash between r557837 and r427780
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557972
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 20 Jul 2007 01:26:55 +0000 (01:26 +0000)]
Multiple trivial fixes from Christophe JAILLET
PR 38699, 39518, 42005, 42006, 42007, 42008, 42009
The patches are all his, and are sufficiently trivial to review
at a glance.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557837
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 Jul 2007 21:13:36 +0000 (21:13 +0000)]
Copy the enum into an integer before sending off to the LDAP SDK, to avoid
passing the address of a short (seen on z/OS)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557778
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 Jul 2007 21:05:16 +0000 (21:05 +0000)]
revert revision 555470
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557772
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Wed, 18 Jul 2007 08:02:21 +0000 (08:02 +0000)]
Simplify OS detection. We are only interested in NT
and WIN2K+ (so we can use services.msc)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557188
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Tue, 17 Jul 2007 18:40:44 +0000 (18:40 +0000)]
Typo fix (noticed by gryzor on IRC)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@557015
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Tue, 17 Jul 2007 14:31:05 +0000 (14:31 +0000)]
Return 503 only if the route matches some of the balancer members and nofailover=On is specified.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556931
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Tue, 17 Jul 2007 10:41:08 +0000 (10:41 +0000)]
ApacheMonitor valid OS is any WIN32_NT version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556879
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Fri, 13 Jul 2007 23:09:30 +0000 (23:09 +0000)]
Updated as per PR 40430. Later confirmed by Massimo Roscio by email to docs@h.a.o
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556175
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Fri, 13 Jul 2007 21:31:32 +0000 (21:31 +0000)]
Missed this on 556153, committing now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556154
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Fri, 13 Jul 2007 21:27:12 +0000 (21:27 +0000)]
Added examples of multiple LDAP servers, and a warning caveat.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556153
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Fri, 13 Jul 2007 20:47:00 +0000 (20:47 +0000)]
Case sensitivity continuity, taken from PR 38035
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@556142
13f79535 -47bb-0310-9956-
ffa450edef68
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