]> granicus.if.org Git - apache/log
apache
12 years agoPromote
Jim Jagielski [Tue, 14 Aug 2012 20:42:45 +0000 (20:42 +0000)]
Promote

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

12 years agoVote on patches
Jim Jagielski [Tue, 14 Aug 2012 20:41:03 +0000 (20:41 +0000)]
Vote on patches

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

12 years agonormal vote/promote stuff
Jeff Trawick [Tue, 14 Aug 2012 11:25:41 +0000 (11:25 +0000)]
normal vote/promote stuff

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

12 years agoAdd a missing paren
Daniel Gruno [Tue, 14 Aug 2012 09:31:26 +0000 (09:31 +0000)]
Add a missing paren

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

12 years agoxforms
Daniel Gruno [Mon, 13 Aug 2012 14:32:59 +0000 (14:32 +0000)]
xforms

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

12 years agogrammar fix
Daniel Gruno [Mon, 13 Aug 2012 14:27:37 +0000 (14:27 +0000)]
grammar fix

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

12 years agoUpdate proposal *blames niq*
Daniel Gruno [Mon, 13 Aug 2012 13:41:56 +0000 (13:41 +0000)]
Update proposal *blames niq*

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

12 years agohtpasswd: Use correct file mode for checking if file is writable.
Rainer Jung [Mon, 13 Aug 2012 11:35:18 +0000 (11:35 +0000)]
htpasswd: Use correct file mode for checking if file is writable.
Also switch to the non-deprecated APR_FOPEN_* flags.
PR: 45923

Backport of r1369618 from trunk.

Submitted by: sf
Reviewed by: rjung, trawick, humbedooh
Backported by: rjung

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

12 years agompm_winnt: Tweak a message added in r750567 so that the accept thread
Rainer Jung [Mon, 13 Aug 2012 11:29:13 +0000 (11:29 +0000)]
mpm_winnt: Tweak a message added in r750567 so that the accept thread
logs the physical address it listens on instead of hostname|*.

Backport of r1364138 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

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

12 years agoAxe unnecessary trailing comma from server-status user output.
Rainer Jung [Mon, 13 Aug 2012 11:26:45 +0000 (11:26 +0000)]
Axe unnecessary trailing comma from server-status user output.

Backport of r1369904 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

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

12 years agoUpdate proposal. I haven't had coffee yet - that must be why.
Daniel Gruno [Mon, 13 Aug 2012 10:04:17 +0000 (10:04 +0000)]
Update proposal. I haven't had coffee yet - that must be why.

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

12 years agoPromote
Daniel Gruno [Mon, 13 Aug 2012 08:34:25 +0000 (08:34 +0000)]
Promote

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

12 years agoVote
Daniel Gruno [Mon, 13 Aug 2012 08:32:31 +0000 (08:32 +0000)]
Vote

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

12 years agoPropose
Daniel Gruno [Mon, 13 Aug 2012 08:22:56 +0000 (08:22 +0000)]
Propose

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

12 years agoawesome beach day
Roy T. Fielding [Sun, 12 Aug 2012 04:22:32 +0000 (04:22 +0000)]
awesome beach day

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

12 years agovote
Gregg Lewis Smith [Sat, 11 Aug 2012 20:44:15 +0000 (20:44 +0000)]
vote

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

12 years agovotes
Jeff Trawick [Sat, 11 Aug 2012 13:29:55 +0000 (13:29 +0000)]
votes

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

12 years agoAdd a round of very easy to review backport proposals.
Rainer Jung [Sat, 11 Aug 2012 13:17:04 +0000 (13:17 +0000)]
Add a round of very easy to review backport proposals.
Also add the revision numbers related to DefaultRuntimeDir.

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

12 years agoComment spelling fix.
Rainer Jung [Sat, 11 Aug 2012 12:42:25 +0000 (12:42 +0000)]
Comment spelling fix.

CTR

Backport of r1368131 from trunk.

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

12 years agoComment
Daniel Gruno [Sat, 11 Aug 2012 12:37:15 +0000 (12:37 +0000)]
Comment

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

12 years agobad header doxygen: ap_rflush does not return the number
Rainer Jung [Sat, 11 Aug 2012 12:34:09 +0000 (12:34 +0000)]
bad header doxygen: ap_rflush does not return the number
of bytes flushed, it returns 0 on success, -1 on error.

Should be CTR.

Backport of rr1368393 and r1368396 from trunk.

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

12 years agoAdd comment to DNT suggestion.
Rainer Jung [Sat, 11 Aug 2012 12:23:09 +0000 (12:23 +0000)]
Add comment to DNT suggestion.

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

12 years agoVote, comment.
Rainer Jung [Sat, 11 Aug 2012 12:22:46 +0000 (12:22 +0000)]
Vote, comment.

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

12 years agoxforms
Rainer Jung [Sat, 11 Aug 2012 11:09:07 +0000 (11:09 +0000)]
xforms

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

12 years agoFix typo/syntax error in docs.
Rainer Jung [Sat, 11 Aug 2012 10:44:48 +0000 (10:44 +0000)]
Fix typo/syntax error in docs.

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

12 years agoFix mod_headers documentation:
Rainer Jung [Sat, 11 Aug 2012 10:42:20 +0000 (10:42 +0000)]
Fix mod_headers documentation:
- add expr= to syntax rule
- add optional replacement argument to Header syntax
- add "edit*" command to Header syntax
- add "edit*" explanation to Header directive

Backport of r1371903 from trunk.

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

12 years agoRevisions r1370592,1370615-1370616 have been backported
Rainer Jung [Sat, 11 Aug 2012 09:47:40 +0000 (09:47 +0000)]
Revisions r1370592,1370615-1370616 have been backported
in r1371164.

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

12 years agothe sun is rising over Mars
Greg Stein [Sat, 11 Aug 2012 08:22:11 +0000 (08:22 +0000)]
the sun is rising over Mars

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

12 years agoit is way too hot for 1am
Roy T. Fielding [Sat, 11 Aug 2012 08:06:16 +0000 (08:06 +0000)]
it is way too hot for 1am

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

12 years ago(SSL failures on Windows with AcceptFilter https none)?
Jeff Trawick [Fri, 10 Aug 2012 18:24:07 +0000 (18:24 +0000)]
(SSL failures on Windows with AcceptFilter https none)?

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

12 years agoab fixes
Jeff Trawick [Fri, 10 Aug 2012 18:09:15 +0000 (18:09 +0000)]
ab fixes

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

12 years agoremove a non-controversial concept vote, replace with a real example
Jeff Trawick [Fri, 10 Aug 2012 10:56:41 +0000 (10:56 +0000)]
remove a non-controversial concept vote, replace with a real example

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

12 years agoxforms
Daniel Gruno [Fri, 10 Aug 2012 07:45:27 +0000 (07:45 +0000)]
xforms

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

12 years agoRemove reference to the iPlanet SDK, as it doesn't seem to exist anymore
Daniel Gruno [Fri, 10 Aug 2012 07:41:53 +0000 (07:41 +0000)]
Remove reference to the iPlanet SDK, as it doesn't seem to exist anymore

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

12 years agoUpdate links that were either broken of just slightly off
Daniel Gruno [Fri, 10 Aug 2012 07:33:10 +0000 (07:33 +0000)]
Update links that were either broken of just slightly off

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

12 years agoCommitted revision 1371208
Jim Jagielski [Thu, 9 Aug 2012 13:38:58 +0000 (13:38 +0000)]
Committed revision 1371208

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

12 years agoMerge r1369995, r1369999, r1370001 from trunk:
Jim Jagielski [Thu, 9 Aug 2012 13:38:38 +0000 (13:38 +0000)]
Merge r1369995, r1369999, r1370001 from trunk:

Use apr_pcalloc for rewritemap_entry struct, to avoid uninitialized entries.

PR: 53663
Submitted by: Mikhail T. <mi apache aldan algebra com>

remove now unecessary assignment

Add changes entry for r1369995, r1369999

Submitted by: sf
Reviewed/backported by: jim

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

12 years agopromote patch
Jim Jagielski [Thu, 9 Aug 2012 13:36:21 +0000 (13:36 +0000)]
promote patch

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

12 years agoVotes on prposals
Jim Jagielski [Thu, 9 Aug 2012 13:35:51 +0000 (13:35 +0000)]
Votes on prposals

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

12 years agoNetWare build tweaks.
Guenter Knauf [Thu, 9 Aug 2012 11:15:45 +0000 (11:15 +0000)]
NetWare build tweaks.
mwccnlm: search directory of referencing file first for #includes.
(backport r1370592, 1370615)
Make use of CFLAGS from environment.
Added default maxerrors value 1 so that the compiler breaks
after 1st error; can be overwritten with CC_MAX_ERRORS var.
(backport 1370616)

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

12 years agoAdded new symbol introduced with r1366693.
Guenter Knauf [Thu, 9 Aug 2012 10:53:01 +0000 (10:53 +0000)]
Added new symbol introduced with r1366693.

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

12 years agoxforms
Daniel Gruno [Thu, 9 Aug 2012 07:36:50 +0000 (07:36 +0000)]
xforms

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

12 years agotypo fixes
Daniel Gruno [Thu, 9 Aug 2012 07:32:27 +0000 (07:32 +0000)]
typo fixes

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

12 years agotypo fix
Daniel Gruno [Thu, 9 Aug 2012 07:06:08 +0000 (07:06 +0000)]
typo fix

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

12 years agoconceptual proposals
Jeff Trawick [Wed, 8 Aug 2012 20:10:54 +0000 (20:10 +0000)]
conceptual proposals

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

12 years agograb r1370907 from trunk:
Jeff Trawick [Wed, 8 Aug 2012 19:36:49 +0000 (19:36 +0000)]
grab r1370907 from trunk:

fix subversion project URL

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

12 years agoxforms
Jeff Trawick [Wed, 8 Aug 2012 14:00:49 +0000 (14:00 +0000)]
xforms

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

12 years agograb 1370764 from trunk:
Jeff Trawick [Wed, 8 Aug 2012 13:58:40 +0000 (13:58 +0000)]
grab 1370764 from trunk:

fix broken module identifiers

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

12 years agoVote.
Joe Orton [Wed, 8 Aug 2012 08:34:25 +0000 (08:34 +0000)]
Vote.

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

12 years agoxforms
Daniel Gruno [Tue, 7 Aug 2012 20:41:43 +0000 (20:41 +0000)]
xforms

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

12 years agofix grammar and remove some scopes within which some directives do not work
Daniel Gruno [Tue, 7 Aug 2012 20:27:40 +0000 (20:27 +0000)]
fix grammar and remove some scopes within which some directives do not work

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

12 years agoUpdate proposal
Daniel Gruno [Tue, 7 Aug 2012 20:07:54 +0000 (20:07 +0000)]
Update proposal

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

12 years agopropose, comment
Stefan Fritsch [Tue, 7 Aug 2012 19:39:54 +0000 (19:39 +0000)]
propose, comment

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

12 years agoUpdate.
Lucien Gentis [Tue, 7 Aug 2012 16:17:52 +0000 (16:17 +0000)]
Update.

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

12 years agoPush out
Jim Jagielski [Tue, 7 Aug 2012 13:36:53 +0000 (13:36 +0000)]
Push out

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

12 years agoUpdate proposal
Daniel Gruno [Tue, 7 Aug 2012 13:05:26 +0000 (13:05 +0000)]
Update proposal

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

12 years agoFix proposal
Daniel Gruno [Mon, 6 Aug 2012 21:48:27 +0000 (21:48 +0000)]
Fix proposal

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

12 years agoComment.
Rainer Jung [Mon, 6 Aug 2012 21:08:05 +0000 (21:08 +0000)]
Comment.

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

12 years agoxforms
Jim Jagielski [Mon, 6 Aug 2012 12:50:00 +0000 (12:50 +0000)]
xforms

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

12 years agoclarify that the 2.4 pidfile APIs process paths relative to ServerRoot
Jeff Trawick [Mon, 6 Aug 2012 12:16:03 +0000 (12:16 +0000)]
clarify that the 2.4 pidfile APIs process paths relative to ServerRoot

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

12 years agoPropose + vote
Daniel Gruno [Mon, 6 Aug 2012 10:05:19 +0000 (10:05 +0000)]
Propose + vote

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

12 years agoUp to date with .en version of the document.
Vincent Deffontaines [Mon, 6 Aug 2012 06:04:36 +0000 (06:04 +0000)]
Up to date with .en version of the document.

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

12 years agoFixing link as reported by Louise Hope @ http://httpd.apache.org/docs/2.2/howto/htacc...
Vincent Deffontaines [Mon, 6 Aug 2012 05:59:53 +0000 (05:59 +0000)]
Fixing link as reported by Louise Hope @ http://httpd.apache.org/docs/2.2/howto/htaccess.html#comment_184

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

12 years agoFix revision number in backport proposal.
Rainer Jung [Sun, 5 Aug 2012 21:46:26 +0000 (21:46 +0000)]
Fix revision number in backport proposal.

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

12 years agoPropose + vote
Daniel Gruno [Sun, 5 Aug 2012 19:31:44 +0000 (19:31 +0000)]
Propose + vote

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

12 years agoAdding new .fr translation for mod_session documentation.
Vincent Deffontaines [Sun, 5 Aug 2012 14:58:34 +0000 (14:58 +0000)]
Adding new .fr translation for mod_session documentation.

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

12 years agomerge r1364709 from trunk:
Jeff Trawick [Sun, 5 Aug 2012 14:35:48 +0000 (14:35 +0000)]
merge r1364709 from trunk:

doc fixes for r1299718:

The value of ScriptSock is relative to DefaultRuntimeDir.

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

12 years agomod_ssl: Add new directive SSLCompression to disable
Rainer Jung [Sun, 5 Aug 2012 13:48:40 +0000 (13:48 +0000)]
mod_ssl: Add new directive SSLCompression to disable
TLS-level compression.

PR 53219.

Backport of r1345319 and r1348656 from trunk.

Submitted by: Bjoern Jacke <bjoern j3e de>, sf
Reviewed by: rjung, trawick
Backported by: rjung

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

12 years agoMerge r1369568 from trunk:
Jeff Trawick [Sun, 5 Aug 2012 13:02:24 +0000 (13:02 +0000)]
Merge r1369568 from trunk:

bytes is not a unit of filename

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

12 years agoSSLCompression directive approved
Jeff Trawick [Sun, 5 Aug 2012 00:14:13 +0000 (00:14 +0000)]
SSLCompression directive approved

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

12 years agoBig mod_lua backport:
Rainer Jung [Sat, 4 Aug 2012 22:21:56 +0000 (22:21 +0000)]
Big mod_lua backport:

r1201460: Add some todos from apachecon notes.
          Submitted by: covener

r1351012: Change prototype of vm_construct, to work around gcc bug which
          causes a segfault.  PR: 52779
          Submitted by: Dick Snippe <Dick Snippe tech omroep nl>

r1351013: Allow tail call optimization in log methods, remove foo method.
          Submitted by: sf

r1351014: Add a few missing request_rec fields. Rename remote_ip to
          client_ip to match conn_rec.
          Submitted by: sf

r1351017: Change various strings from char * to const char *.
          Submitted by: sf

r1351018: Factor common code into utility function.
          Also improve logging a bit and adjust some log levels.
          Submitted by: sf

r1351019: Use macro to make definition of integer fields more compact.
          Submitted by: sf

Reviewed by: humbedooh, covener, sf
Backported by: humbedooh, rjung

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

12 years agoMPM event:
Rainer Jung [Sat, 4 Aug 2012 21:30:11 +0000 (21:30 +0000)]
MPM event:
- Keep track of the number of clogged, lingering, and suspended connections.
- Don't count connections in lingering close state when calculating
  how many additional connections may be accepted

Backport of r1361773 and r 1361778 from trunk.

Submitted by: sf
Reviewed by: rjung, jim
Backported by: rjung

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

12 years agomod_ssl: Pass the server_rec to ssl_die() and use it to log a message to
Rainer Jung [Sat, 4 Aug 2012 21:22:38 +0000 (21:22 +0000)]
mod_ssl: Pass the server_rec to ssl_die() and use it to log a message to
the main error log, pointing to the appropriate virtual host error log.

Backport of r1348660 from trunk.

Submitted by: sf
Reviewed by: rjung, covener
Backported by: rjung

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

12 years agograb r1369435 from trunk:
Jeff Trawick [Sat, 4 Aug 2012 21:00:28 +0000 (21:00 +0000)]
grab r1369435 from trunk:

fix documented default value of ScoreBoardFile

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

12 years agograb r1369300 and 1369431 from trunk:
Jeff Trawick [Sat, 4 Aug 2012 20:44:48 +0000 (20:44 +0000)]
grab r1369300 and 1369431 from trunk:

mention migration from ap_requires() and to ap_runtime_dir_relative()

fix formatting of DEFAULT_REL_RUNTIMEDIR

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

12 years agoMerge r1369419:
Gregg Lewis Smith [Sat, 4 Aug 2012 20:31:50 +0000 (20:31 +0000)]
Merge r1369419:

r1364253  added and include to mod_ssl.h
Show the compiler where to find it

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

12 years agorevert r1369191
Gregg Lewis Smith [Sat, 4 Aug 2012 19:31:16 +0000 (19:31 +0000)]
revert r1369191

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

12 years agovote & promote
Stefan Fritsch [Sat, 4 Aug 2012 16:56:38 +0000 (16:56 +0000)]
vote & promote

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

12 years ago+1 for lua resynch
Eric Covener [Sat, 4 Aug 2012 15:32:52 +0000 (15:32 +0000)]
+1 for lua resynch

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

12 years agor1364253 forces the build to find mod_ssl.h
Gregg Lewis Smith [Fri, 3 Aug 2012 20:13:38 +0000 (20:13 +0000)]
r1364253 forces the build to find mod_ssl.h
This should be CTR, feel free to revert if you do
not like this way of finding the required header.

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

12 years agomerged
Jim Jagielski [Thu, 2 Aug 2012 13:25:05 +0000 (13:25 +0000)]
merged

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

12 years agoMerge r1366319 from trunk:
Jim Jagielski [Thu, 2 Aug 2012 13:09:30 +0000 (13:09 +0000)]
Merge r1366319 from trunk:

ap_str(case)cmp_match returns the opposite of what is advertized in the header.
Submitted by: humbedooh
Reviewed/backported by: jim

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

12 years agoMerge r1361766 from trunk:
Jim Jagielski [Thu, 2 Aug 2012 13:08:43 +0000 (13:08 +0000)]
Merge r1361766 from trunk:

Simplify handling of MaxConnectionsPerChild

If we decrement the counter at accept time and not at close time,
we only need to access the counter in the listener thread and the
code gets much simpler.

Submitted by: sf
Reviewed/backported by: jim

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

12 years agoMerge r1351016 from trunk:
Jim Jagielski [Thu, 2 Aug 2012 13:08:05 +0000 (13:08 +0000)]
Merge r1351016 from trunk:

pass the provider name to parse_require_line as pool userdata

This allows a single C function to implement several authz providers.

Submitted by: sf
Reviewed/backported by: jim

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

12 years agoMerge r1334343 from trunk:
Jim Jagielski [Thu, 2 Aug 2012 13:07:31 +0000 (13:07 +0000)]
Merge r1334343 from trunk:

Use short lived pool to avoid memory leaks

Remove the comment about binding upstream and downstream connections. It
seems to be obsolete since r104604, r104605, r105108.

Also avoid allocating memory if we are not handling the connection.

PR: 52275
Submitted by: Naohiro Ooiwa <naohiro ooiwa miraclelinux com>, Stefan Fritsch

Submitted by: sf
Reviewed/backported by: jim

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

12 years agoMerge r1324760 from trunk:
Jim Jagielski [Thu, 2 Aug 2012 13:05:28 +0000 (13:05 +0000)]
Merge r1324760 from trunk:

Your APR does not include SSL/EVP support. Yes, but how do I enable it? --with-crypto
Submitted by: igalic
Reviewed/backported by: jim

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

12 years agoMerge r1242798 from trunk:
Jim Jagielski [Thu, 2 Aug 2012 13:04:51 +0000 (13:04 +0000)]
Merge r1242798 from trunk:

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
  Treat EAGAIN as an error for a blocking read from the input filter
  stack.

Submitted by: jorton
Reviewed/backported by: jim

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

12 years agopromotion
Jim Jagielski [Thu, 2 Aug 2012 13:04:06 +0000 (13:04 +0000)]
promotion

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

12 years agoVotes
Jim Jagielski [Thu, 2 Aug 2012 13:03:15 +0000 (13:03 +0000)]
Votes

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

12 years agoPropose sync of sf's fixes/refactoring in mod_lua, so we can get the ball rolling...
Daniel Gruno [Wed, 1 Aug 2012 17:16:14 +0000 (17:16 +0000)]
Propose sync of sf's fixes/refactoring in mod_lua, so we can get the ball rolling on the rest of the changes.

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

12 years agoxforms.
Rainer Jung [Wed, 1 Aug 2012 16:38:25 +0000 (16:38 +0000)]
xforms.

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

12 years agoRemove anchor with dublicate id.
Rainer Jung [Wed, 1 Aug 2012 16:23:28 +0000 (16:23 +0000)]
Remove anchor with dublicate id.

Backport of r1368094 from trunk.

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

12 years agoComplete docs metadata (sourcefile and identifier)
Rainer Jung [Wed, 1 Aug 2012 16:21:33 +0000 (16:21 +0000)]
Complete docs metadata (sourcefile and identifier)
for mod_unixd and mod_privileges.

Backport of r1368058 from trunk.

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

12 years agoAdd a docs link to a configuration example.
Rainer Jung [Wed, 1 Aug 2012 15:26:38 +0000 (15:26 +0000)]
Add a docs link to a configuration example.

Backport of r1368053 from trunk.

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

12 years agoDropping the LuaCodeCache proposal until we get the rest of the backports sorted...
Daniel Gruno [Wed, 1 Aug 2012 13:10:58 +0000 (13:10 +0000)]
Dropping the LuaCodeCache proposal until we get the rest of the backports sorted out (tba).

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

12 years agoxforms
Daniel Gruno [Wed, 1 Aug 2012 12:39:30 +0000 (12:39 +0000)]
xforms

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

12 years agoFix an XML bug in the french translation of mod_proxy_html
Daniel Gruno [Wed, 1 Aug 2012 12:36:59 +0000 (12:36 +0000)]
Fix an XML bug in the french translation of mod_proxy_html

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

12 years agoadd a missing </p>
Daniel Gruno [Wed, 1 Aug 2012 12:35:41 +0000 (12:35 +0000)]
add a missing </p>

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

12 years agoChange the external reference to mod_proxy_html to an internal one.
Daniel Gruno [Wed, 1 Aug 2012 12:30:39 +0000 (12:30 +0000)]
Change the external reference to mod_proxy_html to an internal one.

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

12 years agoFix typo in docs
Rainer Jung [Tue, 31 Jul 2012 21:01:02 +0000 (21:01 +0000)]
Fix typo in docs
(miscomception ->misconception)

Backport of r1367778 from trunk.

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