]> granicus.if.org Git - apache/log
apache
10 years agoMerge r1533065, r1491724, r1425360, r1496194 from trunk:
Jim Jagielski [Fri, 15 Nov 2013 17:07:52 +0000 (17:07 +0000)]
Merge r1533065, r1491724, r1425360, r1496194 from trunk:

Eclipse code analysis warning

Reduce stack usage by 3k

style fixes, add comment

no code change

attribute and error reason reversed

Submitted by: jim, jailletc36, sf, covener
Reviewed/backported by: jim

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

10 years agoremove empty file
Jim Jagielski [Fri, 15 Nov 2013 17:06:32 +0000 (17:06 +0000)]
remove empty file

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

10 years agoMerge r1526168, r1527291, r1527294, r1527295, r1527926 from trunk:
Jim Jagielski [Fri, 15 Nov 2013 17:06:18 +0000 (17:06 +0000)]
Merge r1526168, r1527291, r1527294, r1527295, r1527926 from trunk:

Streamline ephemeral key handling:

- drop support for ephemeral RSA keys (only allowed/needed
  for export ciphers)

- drop pTmpKeys from the per-process SSLModConfigRec, and remove
  the temp key generation at startup (unnecessary for DHE/ECDHE)

- unconditionally disable null and export-grade ciphers by always
  prepending "!aNULL:!eNULL:!EXP:" to any cipher suite string

- do not configure per-connection SSL_tmp_*_callbacks, as it is
  sufficient to set them for the SSL_CTX

- set default curve for ECDHE at startup, obviating the need
  for a per-handshake callback, for the time being (and also
  configure SSL_OP_SINGLE_ECDH_USE, previously left out)

For additional background, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%3C52358ED1.2070704@velox.ch%3E

Follow-up fixes for r1526168:

- drop SSL_TMP_KEY_* constants from ssl_private.h, too

- make sure we also disable aNULL, eNULL and EXP ciphers
  for per-directory SSLCipherSuite directives

- apply the same treatment to SSLProxyCipherSuite

Increase minimum required OpenSSL version to 0.9.8a (in preparation
for the next mod_ssl commit, which will rely on the get_rfcX_prime_Y
functions added in that release):

- remove obsolete #defines / macros

- in ssl_private.h, regroup definitions based on whether
  they depend on TLS extension support or not

- for ECC and SRP support, set HAVE_X and change the rather awkward
  #ifndef OPENSSL_NO_X lines accordingly

For the discussion prior to taking this step, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%3C524275C7.9060408%40velox.ch%3E

Improve ephemeral key handling (companion to r1526168):

- allow to configure custom DHE or ECDHE parameters via the
  SSLCertificateFile directive, and adapt its documentation
  accordingly (addresses PR 49559)

- add standardized DH parameters from RFCs 2409 and 3526,
  use them based on the length of the certificate's RSA/DSA key,
  and add a FAQ entry for clients which limit DH support
  to 1024 bits (such as Java 7 and earlier)

- move ssl_dh_GetParamFromFile() from ssl_engine_dh.c to
  ssl_util_ssl.c, and add ssl_ec_GetParamFromFile()

- drop ssl_engine_dh.c from mod_ssl

For the standardized DH parameters, OpenSSL version 0.9.8a
or later is required, which was therefore made a new minimum
requirement in r1527294.

PR 55616 (add missing APLOGNO), part 2
Submitted by: kbrand
Reviewed/backported by: jim

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

10 years agoVote, promote.
Joe Orton [Fri, 15 Nov 2013 15:45:21 +0000 (15:45 +0000)]
Vote, promote.

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

10 years agosome updates
Jim Jagielski [Fri, 15 Nov 2013 14:00:45 +0000 (14:00 +0000)]
some updates

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

10 years agovote
Jim Jagielski [Fri, 15 Nov 2013 13:35:39 +0000 (13:35 +0000)]
vote

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

10 years agoEasy proposals
Christophe Jaillet [Thu, 14 Nov 2013 19:54:25 +0000 (19:54 +0000)]
Easy proposals

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

10 years agoapplies and checks out
Jim Jagielski [Thu, 14 Nov 2013 18:53:13 +0000 (18:53 +0000)]
applies and checks out

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

10 years agoUDS proposal
Jim Jagielski [Thu, 14 Nov 2013 15:50:52 +0000 (15:50 +0000)]
UDS proposal

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

10 years agoGrab r1517919 and countless follow-ups (up through r1529452) from trunk:
Jeff Trawick [Thu, 14 Nov 2013 14:54:22 +0000 (14:54 +0000)]
Grab r1517919 and countless follow-ups (up through r1529452) from trunk:

Add experimental cmake-based build system for Windows.

(Support for both trunk and 2.4.x has been removed for this first commit
to the 2.4.x branch.)

Thanks tdonovan for sharing your earlier version!  A lot
of good stuff is from Tom; a lot of bad stuff is from me.

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

10 years agoreply to comment
Kaspar Brand [Thu, 14 Nov 2013 05:46:22 +0000 (05:46 +0000)]
reply to comment

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

10 years agoTweak wording of entry for event MPM fix
Jeff Trawick [Wed, 13 Nov 2013 13:52:30 +0000 (13:52 +0000)]
Tweak wording of entry for event MPM fix

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

10 years agoowed a CHANGES entry on r1538490 backport, review appreciated.
Eric Covener [Wed, 13 Nov 2013 13:31:22 +0000 (13:31 +0000)]
owed a CHANGES entry on r1538490 backport, review appreciated.

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

10 years agoCreate a new subsection for backports that aren't yet
Jim Jagielski [Wed, 13 Nov 2013 12:54:06 +0000 (12:54 +0000)]
Create a new subsection for backports that aren't yet
ready, but are being made ready. Basically, a holding
place for stuff that should be considered for backporting.

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

10 years agoThis was awhile ago...
Jim Jagielski [Wed, 13 Nov 2013 12:31:14 +0000 (12:31 +0000)]
This was awhile ago...

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

10 years agoAlready in 2.4
Jim Jagielski [Wed, 13 Nov 2013 12:23:17 +0000 (12:23 +0000)]
Already in 2.4

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

10 years agoMove some "stalled" backports and note that a 2.4 patch
Jim Jagielski [Wed, 13 Nov 2013 12:20:46 +0000 (12:20 +0000)]
Move some "stalled" backports and note that a 2.4 patch
is in the works

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

10 years agoBump to v2 patch proposal, first patch missed lenp = NULL
William A. Rowe Jr [Wed, 13 Nov 2013 03:04:36 +0000 (03:04 +0000)]
Bump to v2 patch proposal, first patch missed lenp = NULL

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

10 years agoRevert mis-commit 1541372
William A. Rowe Jr [Wed, 13 Nov 2013 03:04:00 +0000 (03:04 +0000)]
Revert mis-commit 1541372

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

10 years agoBump to v2 patch proposal, first patch missed lenp = NULL
William A. Rowe Jr [Wed, 13 Nov 2013 03:02:53 +0000 (03:02 +0000)]
Bump to v2 patch proposal, first patch missed lenp = NULL

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

10 years agoSync proposed patch and trunk/
William A. Rowe Jr [Wed, 13 Nov 2013 02:58:40 +0000 (02:58 +0000)]
Sync proposed patch and trunk/

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

10 years agofcgi goodness
Jim Jagielski [Tue, 12 Nov 2013 22:57:21 +0000 (22:57 +0000)]
fcgi goodness

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

10 years agoOne concern in accepting this proposal (compilation succeeded)
William A. Rowe Jr [Tue, 12 Nov 2013 22:47:06 +0000 (22:47 +0000)]
One concern in accepting this proposal (compilation succeeded)

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

10 years agoOffer a patch which will apply (but still testing compilation)
William A. Rowe Jr [Tue, 12 Nov 2013 22:11:11 +0000 (22:11 +0000)]
Offer a patch which will apply (but still testing compilation)

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

10 years agoPatch does not apply
William A. Rowe Jr [Tue, 12 Nov 2013 21:20:31 +0000 (21:20 +0000)]
Patch does not apply

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

10 years agoIdea to help https://people.apache.org/~kbrand/mod_ssl-2.4.x-ekh.diff w/review
William A. Rowe Jr [Tue, 12 Nov 2013 20:47:55 +0000 (20:47 +0000)]
Idea to help https://people.apache.org/~kbrand/mod_ssl-2.4.x-ekh.diff w/review

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

10 years agoCommitted revision 1541208.
Jim Jagielski [Tue, 12 Nov 2013 19:35:45 +0000 (19:35 +0000)]
Committed revision 1541208.

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

10 years agoMerge r1540051 from trunk:
Jim Jagielski [Tue, 12 Nov 2013 19:35:32 +0000 (19:35 +0000)]
Merge r1540051 from trunk:

Ensure that the file-based shm file is removed...
Reviewed/backported by: jim

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

10 years agoMerge r1538490 from trunk:
Jim Jagielski [Tue, 12 Nov 2013 19:35:03 +0000 (19:35 +0000)]
Merge r1538490 from trunk:

c->sbh can be unexpectedly NULL when the thread that pulls the ready keepalive
connection out of the queue laps the thread that put it on the queue.

Submitted by: covener
Reviewed/backported by: jim

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

10 years agohttpbis backport...
Jim Jagielski [Tue, 12 Nov 2013 19:33:20 +0000 (19:33 +0000)]
httpbis backport...

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

10 years agoaxe the discussion on the possibility of backporting
Jeff Trawick [Tue, 12 Nov 2013 18:41:26 +0000 (18:41 +0000)]
axe the discussion on the possibility of backporting
the remaining DefaultRuntimeDir functionality to the
2.4.x branch in a way that doesn't break existing
configs; the most recent info is on the dev list anyway

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

10 years agoa few easy votes
Jeff Trawick [Tue, 12 Nov 2013 18:39:47 +0000 (18:39 +0000)]
a few easy votes

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

10 years agoPropose bringing fcgi up to snuff w/ trunk
Jim Jagielski [Tue, 12 Nov 2013 18:18:42 +0000 (18:18 +0000)]
Propose bringing fcgi up to snuff w/ trunk

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

10 years agoNote easier to follow 2.4 patch.
Jim Jagielski [Tue, 12 Nov 2013 17:07:50 +0000 (17:07 +0000)]
Note easier to follow 2.4 patch.

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

10 years ago[2.4][Documentation] Introducing the .fr translation for mod_cache_socache
Vincent Deffontaines [Mon, 11 Nov 2013 18:47:59 +0000 (18:47 +0000)]
[2.4][Documentation] Introducing the .fr translation for mod_cache_socache

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

10 years agoFollow-up to r1540312, adding compatibility note for optional
Chris Darroch [Mon, 11 Nov 2013 18:36:24 +0000 (18:36 +0000)]
Follow-up to r1540312, adding compatibility note for optional
socache provider arguments.

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

10 years agoCommitted revision 1540721.
Jim Jagielski [Mon, 11 Nov 2013 13:53:47 +0000 (13:53 +0000)]
Committed revision 1540721.

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

10 years agoMerge r1532746 from trunk:
Jim Jagielski [Mon, 11 Nov 2013 13:53:31 +0000 (13:53 +0000)]
Merge r1532746 from trunk:

No more magic numbers.
Reviewed/backported by: jim

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

10 years agopromote
Jim Jagielski [Mon, 11 Nov 2013 13:52:38 +0000 (13:52 +0000)]
promote

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

10 years agoeasy vote
Christophe Jaillet [Sat, 9 Nov 2013 18:32:58 +0000 (18:32 +0000)]
easy vote

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

10 years agoUpdates.
Lucien Gentis [Sat, 9 Nov 2013 16:50:32 +0000 (16:50 +0000)]
Updates.

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

10 years agoRock the vote
Daniel Ruggeri [Sat, 9 Nov 2013 15:43:00 +0000 (15:43 +0000)]
Rock the vote

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

10 years agobackport proposal
Jim Jagielski [Sat, 9 Nov 2013 14:45:03 +0000 (14:45 +0000)]
backport proposal

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

10 years agoxforms
Jim Jagielski [Sat, 9 Nov 2013 14:39:01 +0000 (14:39 +0000)]
xforms

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

10 years ago * mod_headers: Allow for format specifiers to be used in the base
Jim Jagielski [Sat, 9 Nov 2013 14:37:23 +0000 (14:37 +0000)]
  * mod_headers: Allow for format specifiers to be used in the base
      substitution string when using Header edit
          trunk patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.trunk.patch
              2.4.x patch: http://people.apache.org/~druggeri/patches/HeaderEditENV.2.4.patch
                  +1: druggeri, covener, jim

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

10 years agoMerge r1531961 from trunk:
Jim Jagielski [Sat, 9 Nov 2013 14:36:18 +0000 (14:36 +0000)]
Merge r1531961 from trunk:

Support optional initialization arguments for socache providers in
mod_authn_socache.

Submitted by: chrisd
Reviewed/backported by: jim

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

10 years agopromote
Jim Jagielski [Sat, 9 Nov 2013 14:35:16 +0000 (14:35 +0000)]
promote

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

10 years agovotes and proposals
Jim Jagielski [Sat, 9 Nov 2013 14:34:49 +0000 (14:34 +0000)]
votes and proposals

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

10 years agoAdd a comment.
Graham Leggett [Fri, 8 Nov 2013 23:37:32 +0000 (23:37 +0000)]
Add a comment.

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

10 years agoThis note seems to fit nicely into the 'OTHER' proposals section
William A. Rowe Jr [Wed, 6 Nov 2013 17:02:48 +0000 (17:02 +0000)]
This note seems to fit nicely into the 'OTHER' proposals section

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

10 years agoPress [pause], there's a section for this
William A. Rowe Jr [Wed, 6 Nov 2013 16:52:50 +0000 (16:52 +0000)]
Press [pause], there's a section for this

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

10 years agopropose, vote, question mod_auth_form
Eric Covener [Mon, 4 Nov 2013 22:53:47 +0000 (22:53 +0000)]
propose, vote, question mod_auth_form

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

11 years agoFixes to the modguide, courtesy of Petter Berntsen (sluggr)
Daniel Gruno [Fri, 1 Nov 2013 12:48:58 +0000 (12:48 +0000)]
Fixes to the modguide, courtesy of Petter Berntsen (sluggr)

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

11 years agomove stray /i switch into proper location
Gregg Lewis Smith [Fri, 1 Nov 2013 05:10:09 +0000 (05:10 +0000)]
move stray /i switch into proper location

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

11 years agoDoc : introducing french translation for getting-started
Vincent Deffontaines [Wed, 30 Oct 2013 14:48:19 +0000 (14:48 +0000)]
Doc : introducing french translation for getting-started

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

11 years agoDoc : reordering a section for better understanding
Vincent Deffontaines [Wed, 30 Oct 2013 14:33:40 +0000 (14:33 +0000)]
Doc : reordering a section for better understanding

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

11 years agoTransformations.
Joe Orton [Mon, 28 Oct 2013 14:32:36 +0000 (14:32 +0000)]
Transformations.

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

11 years agoMerge 1536310 from trunk:
Joe Orton [Mon, 28 Oct 2013 14:31:56 +0000 (14:31 +0000)]
Merge 1536310 from trunk:

* docs/manual/upgrading.xml: Note 2.4 backwards-compat break for
  some piped logging configurations.

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

11 years agoMerge r1531683 from trunk:
Jim Jagielski [Mon, 28 Oct 2013 12:03:26 +0000 (12:03 +0000)]
Merge r1531683 from trunk:

mod_session: Reset the max-age on session save. PR 47476.

Submitted by: minfrin
Reviewed/backported by: jim

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

11 years agoMerge r1531679 from trunk:
Jim Jagielski [Mon, 28 Oct 2013 12:02:17 +0000 (12:02 +0000)]
Merge r1531679 from trunk:

mod_session: After parsing the value of the header specified by the
SessionHeader directive, remove the value from the response. PR 55279.

Submitted by: minfrin
Reviewed/backported by: jim

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

11 years agopromote
Jim Jagielski [Mon, 28 Oct 2013 12:00:51 +0000 (12:00 +0000)]
promote

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

11 years agoMerge r1536021 from trunk:
Eric Covener [Sat, 26 Oct 2013 19:05:56 +0000 (19:05 +0000)]
Merge r1536021 from trunk:

this was backported to 2.2, so not an upgrade issue.

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

11 years agoUpdates.
Lucien Gentis [Sat, 26 Oct 2013 14:34:36 +0000 (14:34 +0000)]
Updates.

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

11 years agoeasy votes
Daniel Ruggeri [Fri, 25 Oct 2013 17:23:21 +0000 (17:23 +0000)]
easy votes

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

11 years agopropose
Daniel Ruggeri [Fri, 25 Oct 2013 17:20:42 +0000 (17:20 +0000)]
propose

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

11 years agonote
Jim Jagielski [Mon, 21 Oct 2013 15:40:09 +0000 (15:40 +0000)]
note

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

11 years agoupdate transformation
André Malo [Sun, 20 Oct 2013 18:39:38 +0000 (18:39 +0000)]
update transformation

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

11 years agoUpdates.
Lucien Gentis [Sat, 19 Oct 2013 14:12:18 +0000 (14:12 +0000)]
Updates.

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

11 years agomerge wording improvement r1533224 from trunk:
Jeff Trawick [Sat, 19 Oct 2013 13:50:06 +0000 (13:50 +0000)]
merge wording improvement r1533224 from trunk:

s/sometimes maybe not what/sometimes may not be what/

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

11 years agoRemove erroneous space reported in pr55676
Daniel Ruggeri [Sat, 19 Oct 2013 12:49:59 +0000 (12:49 +0000)]
Remove erroneous space reported in pr55676

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

11 years agoPropose mod_authn_socache provider argument support.
Chris Darroch [Sat, 19 Oct 2013 02:54:49 +0000 (02:54 +0000)]
Propose mod_authn_socache provider argument support.

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

11 years agoMerge r1529559, r1531505 from trunk:
Jim Jagielski [Fri, 18 Oct 2013 13:38:15 +0000 (13:38 +0000)]
Merge r1529559, r1531505 from trunk:

Fix PR 55397: dav_resource->uri treated as an unparsed uri.

The change made for PR 54611 caused this field to be treated as
unescaped.  mod_dav_svn however, provided escaped URIs.  Essentially
breaking support for paths with non-URI safe characters in SVN.

Adjust the code so that dav_resource->uri is assumed to be escaped and
adjust mod_dav_fs so that it uses escaped URIs in this field.

* modules/dav/fs/repos.c
  (dav_fs_get_resource): Use the unparsed_uri to contruct the resource uri.

* modules/dav/main/mod_dav.c
  (dav_xml_escape_uri): Do not uri escape, just handle xml escaping.
  (dav_created): Assume that locn if provided is escaped.
  (dav_method_copymove, dav_method_bind): Use the unparsed_uri on the request
    when calling dav_created() to adjust to locn assuming it is escaped.

* modules/dav/main/mod_dav.h
  (dav_resource): Document that uri is escaped.

Followup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response.

Previous commit missed encoding the names of the children of the PROPFIND
request when the depth wasn't 0.

* modules/dav/fs/repos.c
  (dav_fs_append_uri): New function
  (dav_fs_walker): Use dav_fs_append_uri() and adjust length calculations to
    use the encoded length.

Submitted by: breser
Reviewed/backported by: jim

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

11 years agoMerge r1528718 from trunk:
Jim Jagielski [Fri, 18 Oct 2013 13:36:21 +0000 (13:36 +0000)]
Merge r1528718 from trunk:

mod_dav: Fix PR 55306.

Makes mod_dav no longer require that the lock token be provided when the
source of a COPY is locked.  The prior behavior was in violating of
RFC 4918 which says that the lock token is only required on resources
that may be modified by the method.

* modules/dav/main/mod_dav.h
  (DAV_VALIDATE_NO_MODIFY): New flag to be passed to dav_validate_* functions.

* modules/dav/main/mod_dav.c
  (dav_method_copymove): Use the new flag when calling dav_validate_request()
    on the COPY source.

* modules/dav/main/util.c
  (dav_validate_resource_state): Use the flag to decide to ignore if the lock
    token is not provided.

Submitted by: breser
Reviewed/backported by: jim

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

11 years agopromote
Jim Jagielski [Fri, 18 Oct 2013 13:33:21 +0000 (13:33 +0000)]
promote

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

11 years agovotes
Jim Jagielski [Fri, 18 Oct 2013 13:33:02 +0000 (13:33 +0000)]
votes

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

11 years agoGrammar. Rebuild other stuff.
Rich Bowen [Thu, 17 Oct 2013 20:42:28 +0000 (20:42 +0000)]
Grammar. Rebuild other stuff.

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

11 years agoBroken markup in example
Rich Bowen [Thu, 17 Oct 2013 18:24:53 +0000 (18:24 +0000)]
Broken markup in example

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

11 years agoCorrect URL for trunk patch
Christophe Jaillet [Thu, 17 Oct 2013 05:08:06 +0000 (05:08 +0000)]
Correct URL for trunk patch

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

11 years agogenerated from "make docs"
Jeff Trawick [Wed, 16 Oct 2013 17:42:35 +0000 (17:42 +0000)]
generated from "make docs"

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

11 years agoMerge r1532816 from trunk:
Jeff Trawick [Wed, 16 Oct 2013 17:23:18 +0000 (17:23 +0000)]
Merge r1532816 from trunk:

Interpolation worked within the scheme portion of URLs for
ProxyPass and ProxyPassReverse until a fix to apr_uri_parse()
in APR-Util 1.5.2 closed the hole that had previously allowed
the necessary {} characters within the scheme.

Lack of support for interpolation within the scheme will be a
permanent limitation.

The mod_proxy documentation is updated to provide an alternate
configuration solution.

PR: 55315
Submitted by: Mike Rumph <mike.rumph oracle.com>
Tweaked by: trawick

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

11 years agohyphenate websocket-aware
Jeff Trawick [Mon, 14 Oct 2013 14:37:03 +0000 (14:37 +0000)]
hyphenate websocket-aware

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

11 years agoPropose.
Graham Leggett [Sun, 13 Oct 2013 13:09:44 +0000 (13:09 +0000)]
Propose.

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

11 years agoPropose.
Graham Leggett [Sun, 13 Oct 2013 12:36:07 +0000 (12:36 +0000)]
Propose.

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

11 years agoPropose.
Graham Leggett [Sun, 13 Oct 2013 12:20:23 +0000 (12:20 +0000)]
Propose.

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

11 years agoVote.
Graham Leggett [Sun, 13 Oct 2013 11:20:36 +0000 (11:20 +0000)]
Vote.

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

11 years ago* STATUS: Nominate changes for PR 55397
Ben Reser [Sat, 12 Oct 2013 16:51:58 +0000 (16:51 +0000)]
* STATUS: Nominate changes for PR 55397

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

11 years agoUpdates.
Lucien Gentis [Sat, 12 Oct 2013 15:07:03 +0000 (15:07 +0000)]
Updates.

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

11 years agoMerge r1526666, r1527220 from trunk:
Jim Jagielski [Thu, 10 Oct 2013 14:34:19 +0000 (14:34 +0000)]
Merge r1526666, r1527220 from trunk:

WinNT MPM: Exit the child if the parent process crashes or is terminated.

Submitted by: Oracle, via trawick

The original modification was made some years ago for Oracle HTTP Server
by an Oracle employee.  trawick made additional changes for style and
for trunk/2.4.x changes.

Follow up to r1526666:

Use SYNCHRONIZE instead of PROCESS_ALL_ACCESS because

a. it is sufficient
b. it avoids an issue where PROCESS_ALL_ACCESS is larger on
   newer SDKs, resulting in a run-time error when running on
   older Windows

Close the handle.

Submitted by: Ivan Zhakov <ivan visualsvn.com>

Submitted by: trawick
Reviewed/backported by: jim

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

11 years agoMerge r1530793 from trunk:
Jim Jagielski [Thu, 10 Oct 2013 14:32:59 +0000 (14:32 +0000)]
Merge r1530793 from trunk:

core: Don't truncate output when sending is interrupted by a signal,
      such as from an exiting CGI process.

PR: 55643

Submitted by: trawick
Reviewed/backported by: jim

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

11 years agopromote
Jim Jagielski [Thu, 10 Oct 2013 14:31:20 +0000 (14:31 +0000)]
promote

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

11 years agovote
Jim Jagielski [Thu, 10 Oct 2013 14:31:00 +0000 (14:31 +0000)]
vote

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

11 years agovotes
Eric Covener [Thu, 10 Oct 2013 12:29:46 +0000 (12:29 +0000)]
votes

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

11 years agopropose a WinNT fix
Jeff Trawick [Thu, 10 Oct 2013 12:03:51 +0000 (12:03 +0000)]
propose a WinNT fix

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

11 years agoPR 55643?
Jeff Trawick [Wed, 9 Oct 2013 23:16:46 +0000 (23:16 +0000)]
PR 55643?

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

11 years agoBreak long lines.
Christophe Jaillet [Wed, 9 Oct 2013 07:14:57 +0000 (07:14 +0000)]
Break long lines.
Add missing <code></code>

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

11 years agoadd a blurb for r1530279 -- null device name on Windows
Jeff Trawick [Tue, 8 Oct 2013 15:36:12 +0000 (15:36 +0000)]
add a blurb for r1530279 -- null device name on Windows

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

11 years agoskiplist v3 :)
Jim Jagielski [Tue, 8 Oct 2013 14:28:32 +0000 (14:28 +0000)]
skiplist v3 :)

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

11 years agoMerge r1524079 from trunk:
Jim Jagielski [Tue, 8 Oct 2013 14:19:55 +0000 (14:19 +0000)]
Merge r1524079 from trunk:

mod_session_crypto: Add support for exec: calls to obtain key similar to
mod_ssl and mod_authnz_ldap. Essentially copypasta from mod_authnz_ldap...

Submitted by: druggeri
Reviewed/backported by: jim

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

11 years agoMerge r1529014 from trunk:
Jim Jagielski [Tue, 8 Oct 2013 14:18:44 +0000 (14:18 +0000)]
Merge r1529014 from trunk:

core: Add missing Reason-Phrase in HTTP response headers.
PR 54946.

Submitted by: rjung
Reviewed/backported by: jim

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

11 years agoMerge r1527008 from trunk:
Jim Jagielski [Tue, 8 Oct 2013 14:17:33 +0000 (14:17 +0000)]
Merge r1527008 from trunk:

Fix the null device name on Windows so that stderr can be sent
to the bit bucket.  (This logic is always hit when using an error
log provider.)

Submitted by: trawick
Reviewed/backported by: jim

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