]>
granicus.if.org Git - apache/log
Igor Galić [Wed, 14 Nov 2012 16:29:17 +0000 (16:29 +0000)]
easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1409247 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Nov 2012 14:21:34 +0000 (14:21 +0000)]
Merge r1399708 from trunk:
only write the first len chars to syslog, as the buffer may have additional
text added speculatively
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408743 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Nov 2012 14:20:20 +0000 (14:20 +0000)]
Merge r1397172 from trunk:
"Iterate" directives: Report an error if no arguments are provided.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408742 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 12 Nov 2012 22:07:00 +0000 (22:07 +0000)]
Vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408471 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 12 Nov 2012 20:01:25 +0000 (20:01 +0000)]
+1 for MS SDK fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408430 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Nov 2012 18:59:20 +0000 (18:59 +0000)]
propose LDAP_UNAVAILABLE windows fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408407 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Nov 2012 14:19:00 +0000 (14:19 +0000)]
Merge r1407965 from trunk:
Replace an incorrect #if by the correct corresponding #if defined(...)
PR 54133 reported by Teodor Milkov ()
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408296 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Nov 2012 14:18:07 +0000 (14:18 +0000)]
Promote and vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408295 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Nov 2012 13:48:46 +0000 (13:48 +0000)]
backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408285 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 12 Nov 2012 12:03:06 +0000 (12:03 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408259 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 12 Nov 2012 11:45:34 +0000 (11:45 +0000)]
easy vote + editorial tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408255 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 11 Nov 2012 19:41:14 +0000 (19:41 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408099 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 11 Nov 2012 19:37:54 +0000 (19:37 +0000)]
Merge r1408093:
Remove SSLv2 stuff that is no longer supported. Add a few newer algorithms
and cipher aliases. This is incomplete, but the openssl 1.0.1c man pages
don't have the complete list either :-(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408096 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 11 Nov 2012 18:35:48 +0000 (18:35 +0000)]
Correct address of trunk patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408077 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 11 Nov 2012 18:31:50 +0000 (18:31 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1408074 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 9 Nov 2012 14:10:45 +0000 (14:10 +0000)]
update list of DefaultRuntimeDir revisions in trunk that need
adjusting for 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1407463 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 8 Nov 2012 03:05:38 +0000 (03:05 +0000)]
s/Options/AllowOverride/ in comment describing AllowOverride
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1406904 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 7 Nov 2012 14:14:32 +0000 (14:14 +0000)]
from trunk r1406646: user-defined needs the hyphen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1406650 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 7 Nov 2012 13:29:14 +0000 (13:29 +0000)]
from trunk r1406616: comment spelling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1406618 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 5 Nov 2012 15:42:10 +0000 (15:42 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1405844 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 4 Nov 2012 15:20:20 +0000 (15:20 +0000)]
Another proposal...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1405555 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 4 Nov 2012 15:12:22 +0000 (15:12 +0000)]
More backport proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1405554 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 1 Nov 2012 16:29:03 +0000 (16:29 +0000)]
Just placeholders
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1404661 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Oct 2012 20:43:48 +0000 (20:43 +0000)]
Merge
1403492 :
fix cut'n'paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403493 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Oct 2012 20:40:48 +0000 (20:40 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403488 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Oct 2012 20:39:05 +0000 (20:39 +0000)]
Backport r1403476:
Mention string-valued expression in the BNF.
Clarify when header names are added to the Vary header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403486 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 29 Oct 2012 16:54:25 +0000 (16:54 +0000)]
Adding .fr translation for rewritemap doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403422 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 28 Oct 2012 17:46:03 +0000 (17:46 +0000)]
Adding .fr translation for rewrite's remapping doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403053 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sun, 28 Oct 2012 17:14:54 +0000 (17:14 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403045 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sun, 28 Oct 2012 17:09:41 +0000 (17:09 +0000)]
r1403041
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403042 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 28 Oct 2012 17:05:34 +0000 (17:05 +0000)]
Adding .fr translation for rewrite's proxying doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403040 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 28 Oct 2012 15:56:24 +0000 (15:56 +0000)]
Adding .fr translation for socache documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1403025 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 27 Oct 2012 20:44:39 +0000 (20:44 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1402865 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:16:04 +0000 (17:16 +0000)]
Merge r1400700 from trunk:
Change default for SSLCompression to off, as compression
causes security issues in most setups
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400962 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:14:38 +0000 (17:14 +0000)]
Merge r1399413 from trunk:
Export mod_xml2enc.h so that others can use the module.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400961 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:14:03 +0000 (17:14 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400960 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 17:13:15 +0000 (17:13 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400959 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:56:49 +0000 (16:56 +0000)]
note docco avail
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400953 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:56:02 +0000 (16:56 +0000)]
mis-merge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400952 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:54:46 +0000 (16:54 +0000)]
Merge r1387085 from trunk:
Use our private function and just allow for conditonal
concat of .persist suffix
Reviewed/backported by: jim
Merge r1386726 from trunk:
Add debug output when slotmem is persisting shm
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400951 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:46:42 +0000 (16:46 +0000)]
Committed revision
1400946
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400947 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:46:24 +0000 (16:46 +0000)]
Merge r1395225 from trunk:
Allow forced setting of TLS1.1 and TLS1.2 protocols with
the -f command-line switch, and adapt the output to more accurately
report what SSL/TLS protocol was negotiated (use SSL_get_version()
instead of SSL_CIPHER_get_version()).
PR: 53916
Submitted by: Nicolás Pernas Maradei <nico emutex com>
Reviewed/amended by: Kaspar Brand
Submitted by: kbrand
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400946 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Oct 2012 16:45:29 +0000 (16:45 +0000)]
Merge r1370763 from trunk:
mod_slotmem_plain: make the "filename" key relative to
DefaultRuntimeDir if not absolute
mod_slotmem_plain does not externalize or check the full path
in any way, so this change is just for consistency with other
modules which build paths to run-time artifacts.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400945 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 22 Oct 2012 05:56:07 +0000 (05:56 +0000)]
Adding documentation patch link for 'FallbackResource disabled' backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400768 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 22 Oct 2012 00:08:46 +0000 (00:08 +0000)]
easy vote / comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400742 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 21 Oct 2012 19:23:38 +0000 (19:23 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400705 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Oct 2012 14:44:05 +0000 (14:44 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400461 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 19 Oct 2012 12:35:43 +0000 (12:35 +0000)]
promote, propose, etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1400072 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 18 Oct 2012 22:41:37 +0000 (22:41 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1399900 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 17 Oct 2012 20:22:38 +0000 (20:22 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1399415 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 16 Oct 2012 01:04:03 +0000 (01:04 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398594 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 15 Oct 2012 17:13:13 +0000 (17:13 +0000)]
Voting for my own proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398391 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 13:02:03 +0000 (13:02 +0000)]
Suggest FallbackResource 'disabled' patch into 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398074 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 12:45:41 +0000 (12:45 +0000)]
Reverting commits r1398064 (src) and r1398065 (doc) as the approval process was not applied.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398071 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 12:18:41 +0000 (12:18 +0000)]
Documenting the new 'disabled' argument accepted by FallbackResource
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398065 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 12:06:10 +0000 (12:06 +0000)]
Adding support for the 'disabled' keyword to FallbackResource
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1398064 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Oct 2012 14:26:51 +0000 (14:26 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1397837 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Oct 2012 12:40:42 +0000 (12:40 +0000)]
Typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1397820 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 12 Oct 2012 18:51:10 +0000 (18:51 +0000)]
Merge r1397681 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
PR53998, stray mod_access reference in mod_info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1397683 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 12 Oct 2012 13:44:35 +0000 (13:44 +0000)]
vote/promote/propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1397561 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 11 Oct 2012 11:34:44 +0000 (11:34 +0000)]
fix typo in r1396879
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1396994 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 11 Oct 2012 00:26:19 +0000 (00:26 +0000)]
example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1396879 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 11 Oct 2012 00:11:48 +0000 (00:11 +0000)]
trivial typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1396869 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 10 Oct 2012 23:06:44 +0000 (23:06 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1396854 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 10 Oct 2012 22:35:50 +0000 (22:35 +0000)]
Add example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1396839 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 8 Oct 2012 19:04:01 +0000 (19:04 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1395725 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 8 Oct 2012 13:42:44 +0000 (13:42 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1395563 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 8 Oct 2012 13:40:55 +0000 (13:40 +0000)]
More specific about default MPM selection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1395561 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 8 Oct 2012 12:01:00 +0000 (12:01 +0000)]
patch vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1395522 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 7 Oct 2012 23:07:23 +0000 (23:07 +0000)]
Rebuilds previous change made only in the XML.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1395423 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 7 Oct 2012 23:05:47 +0000 (23:05 +0000)]
Adds some clarification to the statement that a default MPM is selected
"depending on platform capabilities"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1395421 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Oct 2012 06:35:51 +0000 (06:35 +0000)]
propose, vote, promote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1395229 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 6 Oct 2012 10:41:28 +0000 (10:41 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394989 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 6 Oct 2012 10:40:31 +0000 (10:40 +0000)]
Backport r1394984:
Note that AllowOverride changed its default value to None in 2.3.9
As per comment #264 on site.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394988 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Oct 2012 14:55:29 +0000 (14:55 +0000)]
Update SVG version of powered-by for 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394558 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 14:01:03 +0000 (14:01 +0000)]
suggest r1394079 as the docco fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394081 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:59:50 +0000 (12:59 +0000)]
Merge r1392347 from trunk:
core: ErrorDocument now works for requests without a Host header.
PR: 48357
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394035 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:57:03 +0000 (12:57 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394030 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:56:41 +0000 (12:56 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394029 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:52:54 +0000 (12:52 +0000)]
Merge r1393058 from trunk:
mod_include: When an include file or virtual path fails, include the result
code that tells us why.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394027 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:52:24 +0000 (12:52 +0000)]
Merge r1393033 from trunk:
mod_include: When +Includes is not set and we disable mod_include, tell
the administrator where this happened.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394026 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:51:49 +0000 (12:51 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394024 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:51:06 +0000 (12:51 +0000)]
2 votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394023 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:50:44 +0000 (12:50 +0000)]
Comment on doc suggestion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394022 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:49:09 +0000 (12:49 +0000)]
Merge r1387088 from trunk:
Add in new type CLEARINUSE which allows the inuse table to
be cleared upon storage. This may be expected/wanted/required
by some applications
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394021 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 12:48:25 +0000 (12:48 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394019 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 4 Oct 2012 12:38:52 +0000 (12:38 +0000)]
simple WinNT MPM fix?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394014 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 4 Oct 2012 12:32:59 +0000 (12:32 +0000)]
Merge r1374877,
1374880 ,
1375013 ,
1389316 from trunk:
WinNT MPM: minor improvements
Reviewed by: gsmith, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1394010 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 3 Oct 2012 19:45:43 +0000 (19:45 +0000)]
Fix spelling mistake.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393725 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 3 Oct 2012 19:07:59 +0000 (19:07 +0000)]
property fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393684 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 3 Oct 2012 19:02:41 +0000 (19:02 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393680 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 3 Oct 2012 16:28:40 +0000 (16:28 +0000)]
Another vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393593 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 3 Oct 2012 14:49:59 +0000 (14:49 +0000)]
Add a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393519 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 3 Oct 2012 14:44:31 +0000 (14:44 +0000)]
Some votes and comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393513 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 3 Oct 2012 12:35:44 +0000 (12:35 +0000)]
Backporting the new powered-by images from trunk and removing the animated gif.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393458 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Oct 2012 10:03:57 +0000 (10:03 +0000)]
One merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393383 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Oct 2012 10:03:32 +0000 (10:03 +0000)]
Merge
1387633 ,
1392850 from trunk:
* server/mpm/prefork/prefork.c (child_main): Don't log errors for an
apr_pollset_add() failure if a graceful-stop has been signalled.
follow up to r1387633: use the right exit code depending on the error scenario
Submitted by: jorton, trawick
Reviewed by: trawick, minfrin, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393382 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 2 Oct 2012 21:41:28 +0000 (21:41 +0000)]
mod_proxy: Avoid double slash with "ProxyPassReverse / ..." cases
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1386576
http://svn.apache.org/viewvc?view=revision&revision=
1386578
2.4.x patch: trunk patch works
+1: jim, druggeri, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393199 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 2 Oct 2012 21:29:30 +0000 (21:29 +0000)]
Remove revisions added when they should not have been.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393195 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 2 Oct 2012 21:25:14 +0000 (21:25 +0000)]
mod_cache: Wrong content type and character set when mod_cache serves
stale content because of a proxy error. PR 53539. Correction to r1361153.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1373447
2.4.x patch: trunk patch works.
+1: rjung, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1393191 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log