]>
granicus.if.org Git - apache/log
Christophe Jaillet [Fri, 13 Dec 2013 06:11:00 +0000 (06:11 +0000)]
s/ip/IP/ in comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1550652 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 12 Dec 2013 15:47:39 +0000 (15:47 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1550439 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 5 Dec 2013 19:09:44 +0000 (19:09 +0000)]
An overdue vote. Thanks, Jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1548244 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Dec 2013 12:18:19 +0000 (12:18 +0000)]
Merge r1544820 from trunk:
mod_lua: Fix compiler warning by using correct
APR_SIZE_T_FMT and APR_OFF_T_FMT format macro
in debug logging.
Submitted by: rjung
Reviewed/backported by: jim
NOTE: Not sure about CHANGES... is there a BUGZ on this?
In general, CHANGES is for userland visible changes or
BUGZ bug fixes, and not sure if this really applies
here. But it's OK if someone wants to add something
to CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1546976 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 2 Dec 2013 12:12:16 +0000 (12:12 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1546972 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Dec 2013 08:12:16 +0000 (08:12 +0000)]
Vote + easy proposal to synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1546790 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Nov 2013 16:54:58 +0000 (16:54 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1546753 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 29 Nov 2013 12:16:28 +0000 (12:16 +0000)]
Adding missing changelog entries for mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1546547 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 29 Nov 2013 10:56:53 +0000 (10:56 +0000)]
Merge r1546534 from trunk:
compat note for AuthLDAPBindPassword exec:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1546535 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 28 Nov 2013 18:30:20 +0000 (18:30 +0000)]
List all APR dependencies
PR 54739
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1546439 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 25 Nov 2013 14:11:44 +0000 (14:11 +0000)]
Note released date
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1545293 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 24 Nov 2013 17:32:35 +0000 (17:32 +0000)]
Merge r1545015 from trunk:
drop a caveat with an outdated example, there is now "reallyall" documented above.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1545016 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 23 Nov 2013 17:01:55 +0000 (17:01 +0000)]
Add 1.5 proposals and remove one proposed
backport revision because it is already in 2.4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544834 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Nov 2013 16:00:19 +0000 (16:00 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544824 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Nov 2013 21:02:20 +0000 (21:02 +0000)]
add CHANGES entry for event's apr_atomic sanity check added
to the 2.4.x branch in r1542560
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544676 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 22 Nov 2013 18:29:57 +0000 (18:29 +0000)]
Merge r1544629, r1544626 from trunk:
give a hint about the requirements for <If
include <if> in the list of things that are directory contexts before
clicking through to the sections.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544630 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 22 Nov 2013 00:55:45 +0000 (00:55 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544388 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 22 Nov 2013 00:44:31 +0000 (00:44 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544386 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 22 Nov 2013 00:41:45 +0000 (00:41 +0000)]
fixed validation errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544385 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Nov 2013 00:21:06 +0000 (00:21 +0000)]
r1542330 merged a trunk change to 2.4.x, and the
corresponding trunk revision removed this file;
however, in r1542330 only the lines were removed
remove it now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544383 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 Nov 2013 00:19:06 +0000 (00:19 +0000)]
merge r1544381 from trunk: no more fcgi_protocol.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1544382 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 20 Nov 2013 19:11:06 +0000 (19:11 +0000)]
Merge r1543907 from trunk:
doc behavior change in r821333, CacheEnable foo / does not apply to forward
proxy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543909 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Nov 2013 17:33:17 +0000 (17:33 +0000)]
And we are 2.4.8-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543513 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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