]> granicus.if.org Git - apache/log
apache
12 years agoxforms
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

12 years agor1403041
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

12 years agoAdding .fr translation for rewrite's proxying doc
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

12 years agoAdding .fr translation for socache documentation.
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

12 years agoUpdate xforms
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

12 years agoMerge r1400700 from trunk:
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

12 years agoMerge r1399413 from trunk:
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

12 years agopromote
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

12 years agovotes
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

12 years agonote docco avail
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

12 years agomis-merge
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

12 years agoMerge r1387085 from trunk:
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

12 years agoCommitted revision 1400946
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

12 years agoMerge r1395225 from trunk:
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

12 years agoMerge r1370763 from trunk:
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

12 years agoAdding documentation patch link for 'FallbackResource disabled' backport
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

12 years agoeasy vote / comment
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

12 years agopropose
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

12 years agoUpdates.
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

12 years agopromote, propose, etc.
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

12 years agoTypo
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

12 years agoPropose.
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

12 years agovote/promote
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

12 years agoVoting for my own proposal
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

12 years agoSuggest FallbackResource 'disabled' patch into 2.4
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

12 years agoReverting commits r1398064 (src) and r1398065 (doc) as the approval process was not...
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

12 years agoDocumenting the new 'disabled' argument accepted by FallbackResource
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

12 years agoAdding support for the 'disabled' keyword to FallbackResource
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

12 years agoUpdates.
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

12 years agoTypo correction.
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

12 years agoMerge r1397681 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
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

12 years agovote/promote/propose
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

12 years agofix typo in r1396879
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

12 years agoexample
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

12 years agotrivial typo
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

12 years agoRebuild
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

12 years agoAdd example
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

12 years agovote
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

12 years agoRebuild
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

12 years agoMore specific about default MPM selection
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

12 years agopatch vote
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

12 years agoRebuilds previous change made only in the XML.
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

12 years agoAdds some clarification to the statement that a default MPM is selected
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

12 years agopropose, vote, promote, comment
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

12 years agoxforms
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

12 years agoBackport r1394984:
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

12 years agoUpdate SVG version of powered-by for 2.4
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

12 years agosuggest r1394079 as the docco fix
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

12 years agoMerge r1392347 from trunk:
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

12 years agopromote
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

12 years agovote
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

12 years agoMerge r1393058 from trunk:
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

12 years agoMerge r1393033 from trunk:
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

12 years agopromote
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

12 years ago2 votes
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

12 years agoComment on doc suggestion
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

12 years agoMerge r1387088 from trunk:
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

12 years agopromote
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

12 years agosimple WinNT MPM fix?
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

12 years agoMerge r1374877,1374880,1375013,1389316 from trunk:
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

12 years agoFix spelling mistake.
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

12 years agoproperty fix.
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

12 years agoupdate transformation
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

12 years agoAnother vote.
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

12 years agoAdd a comment.
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

12 years agoSome votes and comments.
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

12 years agoBackporting the new powered-by images from trunk and removing the animated gif.
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

12 years agoOne merged.
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

12 years agoMerge 1387633,1392850 from trunk:
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

12 years agomod_proxy: Avoid double slash with "ProxyPassReverse / ..." cases
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

12 years agoRemove revisions added when they should not have been.
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

12 years agomod_cache: Wrong content type and character set when mod_cache serves
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

12 years agoVote and promote.
Graham Leggett [Tue, 2 Oct 2012 21:21:31 +0000 (21:21 +0000)]
Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393190 13f79535-47bb-0310-9956-ffa450edef68

12 years agoVote and promote.
Graham Leggett [Tue, 2 Oct 2012 21:14:51 +0000 (21:14 +0000)]
Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393187 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd a comment.
Graham Leggett [Tue, 2 Oct 2012 21:12:49 +0000 (21:12 +0000)]
Add a comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393186 13f79535-47bb-0310-9956-ffa450edef68

12 years agoVote.
Graham Leggett [Tue, 2 Oct 2012 20:33:17 +0000 (20:33 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393160 13f79535-47bb-0310-9956-ffa450edef68

12 years agoPropose.
Graham Leggett [Tue, 2 Oct 2012 20:23:20 +0000 (20:23 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1393157 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1386822 from trunk:
Jim Jagielski [Tue, 2 Oct 2012 13:06:39 +0000 (13:06 +0000)]
Merge r1386822 from trunk:

More consistent return errors...
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1392899 13f79535-47bb-0310-9956-ffa450edef68

12 years agovote+promote "mod_slotmem_shm: Consistent and logical return errors"
Jeff Trawick [Tue, 2 Oct 2012 11:53:40 +0000 (11:53 +0000)]
vote+promote "mod_slotmem_shm: Consistent and logical return errors"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1392863 13f79535-47bb-0310-9956-ffa450edef68

12 years agobe suspicious of sick children on a school day
Jeff Trawick [Tue, 2 Oct 2012 11:35:00 +0000 (11:35 +0000)]
be suspicious of sick children on a school day

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1392851 13f79535-47bb-0310-9956-ffa450edef68

12 years agomissing-host-header error path tweak
Jeff Trawick [Mon, 1 Oct 2012 14:49:11 +0000 (14:49 +0000)]
missing-host-header error path tweak

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1392365 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate.
Lucien Gentis [Sat, 29 Sep 2012 14:41:29 +0000 (14:41 +0000)]
Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1391817 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdates.
Lucien Gentis [Sat, 29 Sep 2012 14:00:21 +0000 (14:00 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1391802 13f79535-47bb-0310-9956-ffa450edef68

12 years agoThe LuaCodeCache patch seems stalled to me :)
Jim Jagielski [Wed, 26 Sep 2012 14:33:21 +0000 (14:33 +0000)]
The LuaCodeCache patch seems stalled to me :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390523 13f79535-47bb-0310-9956-ffa450edef68

12 years agoez patch
Jim Jagielski [Wed, 26 Sep 2012 14:32:33 +0000 (14:32 +0000)]
ez patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390520 13f79535-47bb-0310-9956-ffa450edef68

12 years agoCommitted revision 1390518.
Jim Jagielski [Wed, 26 Sep 2012 14:31:24 +0000 (14:31 +0000)]
Committed revision 1390518.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390519 13f79535-47bb-0310-9956-ffa450edef68

12 years agobackport r1385216, r1387610 from trunk:
Jim Jagielski [Wed, 26 Sep 2012 14:30:31 +0000 (14:30 +0000)]
backport r1385216, r1387610 from trunk:

Spin off module-specific build options into separate build vars.
[second try, supersedes r1385214]

Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390518 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAnd promote MOD_CFLAGS
Jim Jagielski [Wed, 26 Sep 2012 14:29:58 +0000 (14:29 +0000)]
And promote MOD_CFLAGS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390517 13f79535-47bb-0310-9956-ffa450edef68

12 years agoVote on MOD_CFLAGS
Jim Jagielski [Wed, 26 Sep 2012 14:29:22 +0000 (14:29 +0000)]
Vote on MOD_CFLAGS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390516 13f79535-47bb-0310-9956-ffa450edef68

12 years agor1390512
Jim Jagielski [Wed, 26 Sep 2012 14:26:51 +0000 (14:26 +0000)]
r1390512

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390514 13f79535-47bb-0310-9956-ffa450edef68

12 years agoinstallwinconf.awk: install.log output tweaks; reduced path convertion
Jim Jagielski [Wed, 26 Sep 2012 14:25:37 +0000 (14:25 +0000)]
installwinconf.awk: install.log output tweaks; reduced path convertion

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390511 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1373898 from trunk:
Jim Jagielski [Wed, 26 Sep 2012 14:24:37 +0000 (14:24 +0000)]
Merge r1373898 from trunk:

Fix crash in packet dump code of mod_proxy_ajp when
logging with LogLevel trace7 or trace8.

PR 53730

Submitted by: rjung
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390510 13f79535-47bb-0310-9956-ffa450edef68

12 years agovote/promote
Jeff Trawick [Wed, 26 Sep 2012 12:59:50 +0000 (12:59 +0000)]
vote/promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390452 13f79535-47bb-0310-9956-ffa450edef68

12 years agovote
Gregg Lewis Smith [Wed, 26 Sep 2012 09:10:00 +0000 (09:10 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390340 13f79535-47bb-0310-9956-ffa450edef68

12 years agosimple WinNT MPM fixes from trunk?
Jeff Trawick [Mon, 24 Sep 2012 12:26:50 +0000 (12:26 +0000)]
simple WinNT MPM fixes from trunk?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389331 13f79535-47bb-0310-9956-ffa450edef68

12 years agobackport typo fixes from trunk
Daniel Gruno [Mon, 24 Sep 2012 11:54:13 +0000 (11:54 +0000)]
backport typo fixes from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389315 13f79535-47bb-0310-9956-ffa450edef68

12 years agoxforms
Daniel Gruno [Mon, 24 Sep 2012 10:42:27 +0000 (10:42 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389283 13f79535-47bb-0310-9956-ffa450edef68

12 years agoWhitespace issue + Spanish typo fix (as per comment #308)
Daniel Gruno [Mon, 24 Sep 2012 10:34:31 +0000 (10:34 +0000)]
Whitespace issue + Spanish typo fix (as per comment #308)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389279 13f79535-47bb-0310-9956-ffa450edef68

12 years ago * headers: Move *_DECLARE_* macros to beginning of line in headers.
Jim Jagielski [Mon, 24 Sep 2012 09:49:55 +0000 (09:49 +0000)]
   * headers: Move *_DECLARE_* macros to beginning of line in headers.
        trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1374963
             2.4.x patch: http://people.apache.org/~fuankg/diffs/httpd-2.4.x_headers.diff
                  +1: fuankg, humbedooh, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389266 13f79535-47bb-0310-9956-ffa450edef68

12 years agopromote
Jim Jagielski [Mon, 24 Sep 2012 09:48:44 +0000 (09:48 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1389265 13f79535-47bb-0310-9956-ffa450edef68