]> granicus.if.org Git - apache/log
apache
10 years agoGet ready to tag 2.4.7
Jim Jagielski [Tue, 19 Nov 2013 17:31:34 +0000 (17:31 +0000)]
Get ready to tag 2.4.7

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

10 years agoupdate note in STATUS
Daniel Ruggeri [Tue, 19 Nov 2013 16:38:29 +0000 (16:38 +0000)]
update note in STATUS

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

10 years agoMaybe not so ready - more chatting/details on dev list
Daniel Ruggeri [Tue, 19 Nov 2013 16:37:25 +0000 (16:37 +0000)]
Maybe not so ready - more chatting/details on dev list

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

10 years agoGood idea from Jeff
Jim Jagielski [Tue, 19 Nov 2013 16:27:36 +0000 (16:27 +0000)]
Good idea from Jeff

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

10 years agoMerge r1543282 from trunk:
Jeff Trawick [Tue, 19 Nov 2013 01:11:10 +0000 (01:11 +0000)]
Merge r1543282 from trunk:

Stringify ICON_FILE, like other values passed in via -Dxx=yy

With an out of tree build like cmake, certain paths to the source tree and icon
file can foil parsing of this line by the resource compiler unless the path is
quoted.

Submitted by: Bert Huijben
Reviewed by: trawick

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

10 years agoMerge r1543147 and r1543149 from trunk:
Jeff Trawick [Mon, 18 Nov 2013 21:18:12 +0000 (21:18 +0000)]
Merge r1543147 and r1543149 from trunk:

fix versioninfo fields for abs.exe

Workaround issue with defining a preprocessor symbol to a string value
with embedded blanks.

The extra, escaped quoting in the original version is required for passing
the definition over the command-line, but it broke Visual Studio builds.

For now, avoid the extra quoting when generating for Visual Studio.

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

10 years agoVote
Daniel Ruggeri [Mon, 18 Nov 2013 19:14:41 +0000 (19:14 +0000)]
Vote

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

10 years agorebuild xforms
Jim Jagielski [Mon, 18 Nov 2013 18:03:51 +0000 (18:03 +0000)]
rebuild xforms

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

10 years agomissed in applied patch
Jim Jagielski [Sun, 17 Nov 2013 21:25:02 +0000 (21:25 +0000)]
missed in applied patch

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

10 years agoslotmem_shm: Error detection
Graham Leggett [Sun, 17 Nov 2013 20:10:28 +0000 (20:10 +0000)]
slotmem_shm: Error detection

trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1540161
             https://svn.apache.org/viewvc?view=revision&revision=1540163
             https://svn.apache.org/viewvc?view=revision&revision=1540178
             https://svn.apache.org/viewvc?view=revision&revision=1540179
             https://svn.apache.org/viewvc?view=revision&revision=1540220
             http://svn.apache.org/viewvc?view=revision&revision=r1542413
2.4.x patch: http://people.apache.org/~jim/patches/slotmem-error2.patch

Submitted by: jim
Reviewed by: jorton, minfrin

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

10 years agoVote, promote.
Graham Leggett [Sun, 17 Nov 2013 20:07:11 +0000 (20:07 +0000)]
Vote, promote.

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

10 years agoMerge r1542752 from trunk:
Eric Covener [Sun, 17 Nov 2013 16:25:06 +0000 (16:25 +0000)]
Merge r1542752 from trunk:

reword windows binaries text so it's clear that you may or may not see
binaries for a given release.  Remove a "HTTPd" term that looked funny.

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

10 years agoBackport proposal to fix canon inconsistency between http, ajp and fcgi
Jim Jagielski [Sun, 17 Nov 2013 16:14:26 +0000 (16:14 +0000)]
Backport proposal to fix canon inconsistency between http, ajp and fcgi

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

10 years agoNote new patch
Jim Jagielski [Sun, 17 Nov 2013 15:30:24 +0000 (15:30 +0000)]
Note new patch

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

10 years agoComment.
Graham Leggett [Sat, 16 Nov 2013 20:08:39 +0000 (20:08 +0000)]
Comment.

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

10 years agoevent: Use skiplist and fold in performance tweeks from trunk
Graham Leggett [Sat, 16 Nov 2013 20:05:42 +0000 (20:05 +0000)]
event: Use skiplist and fold in performance tweeks from trunk

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1451706
             http://svn.apache.org/viewvc?view=revision&revision=1517365
             http://svn.apache.org/viewvc?view=revision&revision=1529442
2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-event-v3.patch

Submitted by: jim
Reviewed by: rjung, minfrin

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

10 years agoVote, promote.
Graham Leggett [Sat, 16 Nov 2013 20:03:46 +0000 (20:03 +0000)]
Vote, promote.

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

10 years agompm_unix: Add ap_mpm_podx_* implementation to avoid code duplication
Graham Leggett [Sat, 16 Nov 2013 19:24:53 +0000 (19:24 +0000)]
mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplication
and align w/ trunk.

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1409214
             http://svn.apache.org/viewvc?view=revision&revision=1410004
2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-podx-v2.patch

Submitted by: jim
Reviewed by: rjung, minfrin

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

10 years agoVote, promote.
Graham Leggett [Sat, 16 Nov 2013 19:20:15 +0000 (19:20 +0000)]
Vote, promote.

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

10 years agoPotential rejection of valid MaxMemFree and ThreadStackSize directives
Graham Leggett [Sat, 16 Nov 2013 18:55:39 +0000 (18:55 +0000)]
Potential rejection of valid MaxMemFree and ThreadStackSize directives

trunk patch: https://svn.apache.org/r1542338

Submitted by: Mike Rumph <mike.rumph oracle.com>
Reviewed by: trawick, covener, sf

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

10 years agofollow up to r1542328: ssl_engine_dh.c is gone
Jeff Trawick [Sat, 16 Nov 2013 17:38:11 +0000 (17:38 +0000)]
follow up to r1542328: ssl_engine_dh.c is gone

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

10 years agocomment
Stefan Fritsch [Sat, 16 Nov 2013 17:13:43 +0000 (17:13 +0000)]
comment

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

10 years agovote+promote, comment
Stefan Fritsch [Sat, 16 Nov 2013 16:51:07 +0000 (16:51 +0000)]
vote+promote, comment

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

10 years agoUpdates.
Lucien Gentis [Sat, 16 Nov 2013 15:09:46 +0000 (15:09 +0000)]
Updates.

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

10 years agovote
Eric Covener [Fri, 15 Nov 2013 18:05:14 +0000 (18:05 +0000)]
vote

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

10 years agoerrno = 0
Jeff Trawick [Fri, 15 Nov 2013 17:50:24 +0000 (17:50 +0000)]
errno = 0

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

10 years agoxforms
Jim Jagielski [Fri, 15 Nov 2013 17:11:13 +0000 (17:11 +0000)]
xforms

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

10 years agoMerge r1523281, r1524368, r1525276, r1525280, r1525281 from trunk:
Jim Jagielski [Fri, 15 Nov 2013 17:09:16 +0000 (17:09 +0000)]
Merge r1523281, r1524368, r1525276, r1525280, r1525281 from trunk:

Switch from private FastCGI protocol handling to util_fcgi API.

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Bring some envvar flexibility from mod_authnz_fcgi to mod_proxy_fcgi:

mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars.
An individual envvar with an encoded length of more than 16K will be
omitted.

Borrow a fix from mod_authnz_fcgi:

mod_proxy_fcgi: Handle reading protocol data that is split between
packets.

Use ap_log_rdata() to dump the FastCGI header, axing a bunch
of custom data dumping code.

Submitted by: trawick, jkaluza, trawick, trawick, trawick
Reviewed/backported by: jim

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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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