]>
granicus.if.org Git - apache/log
Jim Jagielski [Mon, 26 Jun 2017 12:17:43 +0000 (12:17 +0000)]
mod_http2 is no longer experimental nor CTR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799887 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 26 Jun 2017 06:13:59 +0000 (06:13 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799853 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 25 Jun 2017 14:49:38 +0000 (14:49 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799813 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 25 Jun 2017 14:48:43 +0000 (14:48 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799811 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 25 Jun 2017 08:32:32 +0000 (08:32 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799790 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 25 Jun 2017 08:28:12 +0000 (08:28 +0000)]
core.xml: Wrap a Define directive sentence in a <note>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799789 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 25 Jun 2017 07:11:45 +0000 (07:11 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799787 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 21 Jun 2017 17:50:04 +0000 (17:50 +0000)]
Remove a dead link (/docs/STATUS)
Remove a link to an EOL branch (2.0)
Add some links to APR & APR-Util 1.6.
Add release date for 2.4.26
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799489 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 19 Jun 2017 16:59:25 +0000 (16:59 +0000)]
combine duplicates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799230 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Jun 2017 16:36:07 +0000 (16:36 +0000)]
NOTE CVEs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1799225 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 14 Jun 2017 11:14:20 +0000 (11:14 +0000)]
smash dup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798665 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Jun 2017 17:29:26 +0000 (17:29 +0000)]
And we are now 2.4.27-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798616 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Jun 2017 17:26:16 +0000 (17:26 +0000)]
Roll on 2.4.26
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798614 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 17:15:09 +0000 (17:15 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798492 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 17:13:40 +0000 (17:13 +0000)]
wrong module :) Thx eric
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798491 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 15:47:57 +0000 (15:47 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798482 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 15:43:51 +0000 (15:43 +0000)]
more tags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798481 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 14:13:50 +0000 (14:13 +0000)]
Note that as of 2.4.26, HTTP/2 is no longer considered "experimental"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798472 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 14:12:28 +0000 (14:12 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798471 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 14:11:37 +0000 (14:11 +0000)]
no longer experimental
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798470 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 14:10:02 +0000 (14:10 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798468 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 12 Jun 2017 14:08:56 +0000 (14:08 +0000)]
Will be no longer experimental
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798467 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jun 2017 16:45:24 +0000 (16:45 +0000)]
Fix Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798332 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jun 2017 16:41:15 +0000 (16:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798331 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jun 2017 16:40:01 +0000 (16:40 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798330 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 10 Jun 2017 15:51:28 +0000 (15:51 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798328 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 10 Jun 2017 15:51:01 +0000 (15:51 +0000)]
correct release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798327 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 8 Jun 2017 17:00:47 +0000 (17:00 +0000)]
Add proposed T&R date for 2.4.26
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798090 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 8 Jun 2017 16:33:30 +0000 (16:33 +0000)]
note some changes re: http2 as "experimental" and ctr/rtc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798089 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 8 Jun 2017 16:32:21 +0000 (16:32 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1798088 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Jun 2017 09:22:52 +0000 (09:22 +0000)]
On the 2.4.x branch:
mod_http2 showstopper resolved.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797760 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Jun 2017 09:08:25 +0000 (09:08 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1797745
mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep
the session in continuous check for state changes that never happen.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797758 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Jun 2017 08:51:07 +0000 (08:51 +0000)]
retracting proposal as RTC seems not to be in effect yet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797757 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Jun 2017 08:38:33 +0000 (08:38 +0000)]
proposing mod_http2 busy loop fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797755 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 6 Jun 2017 06:01:00 +0000 (06:01 +0000)]
Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797732 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Jun 2017 12:13:24 +0000 (12:13 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797654 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Jun 2017 12:12:31 +0000 (12:12 +0000)]
SECURITY: CVE-2017-7679 (cve.mitre.org)
mod_mime can read one byte past the end of a buffer when sending a
malicious Content-Type response header.
Merge
1797550 from trunk:
mod_mime: fix quoted pair scanning
Submitted By: ylavic
Reviewed By: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797653 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Jun 2017 12:10:05 +0000 (12:10 +0000)]
backported in r1797651
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797652 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Jun 2017 12:09:49 +0000 (12:09 +0000)]
Merge from trunk:
mpm_{worker,prefork}: save some cycles by not copying the listener's pollfds
for each pollset operation.
We don't need a copy when poll()ing if those are allocated with the correct
lifetime (the listener thread) at the very beginning.
*) worker, prefork: save some cycles by not copying the listener's pollfds
for each pollset operation
trunk patch: http://svn.apache.org/r1662437
2.4.x patch: svn merge -c
1662437 ^/httpd/httpd/trunk .
+1: jailletc36, ylavic, jim
Submitted By: jailletc36
Reviewed By: jailletc36, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797651 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Jun 2017 12:07:43 +0000 (12:07 +0000)]
Merge from trunk:
Add upgrade parameter to mod_proxy_wstunnel.
That allows to upgrade to jboss-remoting for example
or to run an HTTP/1.1 backend that needs to upgrade to
WebSocket.
See also:
https://issues.jboss.org/browse/JBCS-254
https://issues.jboss.org/browse/JBCS-291
whitespace only
Submitted By: jfclere
Reviewed By: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797650 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 5 Jun 2017 11:17:20 +0000 (11:17 +0000)]
may or may not be a show-stopper :P
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797643 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 5 Jun 2017 11:16:54 +0000 (11:16 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797641 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 5 Jun 2017 11:16:14 +0000 (11:16 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797640 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Jun 2017 14:53:00 +0000 (14:53 +0000)]
Remove spaces in svn command
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797585 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Jun 2017 14:51:11 +0000 (14:51 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797583 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Jun 2017 06:57:28 +0000 (06:57 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797559 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 3 Jun 2017 22:10:59 +0000 (22:10 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797553 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 3 Jun 2017 22:06:32 +0000 (22:06 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797551 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 3 Jun 2017 18:07:43 +0000 (18:07 +0000)]
LINK : warning LNK4013: image size 0x35000 exceeds specified maximum 0x30000
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797526 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 2 Jun 2017 23:38:24 +0000 (23:38 +0000)]
Withdraw unrelated comment, and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797467 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 2 Jun 2017 23:24:56 +0000 (23:24 +0000)]
Vote (+promote), comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797466 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 2 Jun 2017 20:30:04 +0000 (20:30 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797429 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 2 Jun 2017 10:58:38 +0000 (10:58 +0000)]
Merge r1783849 from trunk:
MPMs unix: Place signals handlers and helpers out of DSOs to avoid
a possible crash if a signal is caught during (graceful) restart.
PR 60487.
Reviewedby: ylavic, wrowe, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797368 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Jun 2017 09:13:31 +0000 (09:13 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797337 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Jun 2017 09:03:57 +0000 (09:03 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797334 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 1 Jun 2017 18:34:13 +0000 (18:34 +0000)]
fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797242 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 31 May 2017 12:03:47 +0000 (12:03 +0000)]
Note show-stopper
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797021 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 31 May 2017 01:36:10 +0000 (01:36 +0000)]
Good catch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796965 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 17:09:11 +0000 (17:09 +0000)]
wstunnel vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796895 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 30 May 2017 13:44:20 +0000 (13:44 +0000)]
propose jfclere's issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796866 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:28:20 +0000 (12:28 +0000)]
SECURITY: CVE-2017-7668 (cve.mitre.org)
The HTTP strict parsing changes added in 2.2.32 and 2.4.24 introduced a
bug in token list parsing, which allows ap_find_token() to search past
the end of its input string. By maliciously crafting a sequence of
request headers, an attacker may be able to cause a segmentation fault,
or to force ap_find_token() to return an incorrect value.
Merge r1796350 from trunk:
short-circuit on NULL
Submitted by: jchampion, covener
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796856 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:27:41 +0000 (12:27 +0000)]
SECURITY: CVE-2017-3167 (cve.mitre.org)
Use of the ap_get_basic_auth_pw() by third-party modules outside of the
authentication phase may lead to authentication requirements being
bypassed.
Merge r1796348 from trunk:
core: Deprecate ap_get_basic_auth_pw() and add ap_get_basic_auth_components().
Submitted By: Emmanuel Dreyfus <manu netbsd.org>, jchampion, coverner
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796855 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:26:05 +0000 (12:26 +0000)]
SECURITY: CVE-2017-3169 (cve.mitre.org)
mod_ssl may dereference a NULL pointer when third-party modules call
ap_hook_process_connection() during an HTTP request to an HTTPS port.
Merge r1796343 from trunk:
mod_ssl: fix ctx passed to ssl_io_filter_error()
Consistently pass the expected bio_filter_in_ctx_t
to ssl_io_filter_error().
Submitted by: ylavic, covener
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796854 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:25:13 +0000 (12:25 +0000)]
Merge r1795635 from trunk:
When processing a 'SetEnv' directive, warn if the environment variable name includes a '='. It is likely a configuration error. PR 60249
Submitted by: jailletc36
Reviewed by: jailletc36, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796853 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:24:22 +0000 (12:24 +0000)]
Merge r1776463 from trunk:
PR60009: RewriteRule local prefix checking update
*) mod_rewrite: When a substitution is a fully qualified URL, and the
scheme/host/port matches the current virtual host, stop interpreting the
path component as a local path just because the first component of the
path exists in the filesystem. Adds RewriteOption "LegacyPrefixDocRoot"
to revert to previous behavior. PR60009.
Submitted By: Hank Ibell <hwibell gmail.com>
Submitted by: covener
Reviewed by: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796852 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:19:58 +0000 (12:19 +0000)]
Merge r1584417, r1585157 from trunk:
allow users to workaround the over-agressive backreference
escaping by selecting the characters to escape.
add BNP flag to give control to the user on whether a space ' ' in
an escaped backrefernece is decoded to a + (default) or %20. Useful
if your backreference isn't going into the query string.
Submitted by: covener
Reviewed by: jailletc36, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796850 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:18:18 +0000 (12:18 +0000)]
Merge r1796446 from trunk:
PR61124: ap_parse_form_data() EBCDIC fix
URL-decoding doesn't work on EBCDIC.
Submitted By: Hank Ibell <hwibell gmail.com>
Submitted by: covener
Reviewed by: covener, rjung, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796849 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:16:56 +0000 (12:16 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796848 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:16:31 +0000 (12:16 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796847 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 30 May 2017 06:25:31 +0000 (06:25 +0000)]
Synch with trunk.
Backport r1575391 in order to describe =~ and !~
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796727 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 May 2017 10:41:22 +0000 (10:41 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796614 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 21:15:41 +0000 (21:15 +0000)]
Merge r1796493 from trunk:
ab: enable option processing for setting a custom
HTTP method also for non-SSL builds.
Submitted by: rjung
Reviewed by: rjung, covener, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796539 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 28 May 2017 20:16:44 +0000 (20:16 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796532 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 28 May 2017 19:38:48 +0000 (19:38 +0000)]
copypasta error on r1796522, still needs a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796524 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 28 May 2017 19:15:48 +0000 (19:15 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796522 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 28 May 2017 15:27:39 +0000 (15:27 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796506 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 May 2017 15:00:47 +0000 (15:00 +0000)]
Fix dead link and synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796503 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 14:42:39 +0000 (14:42 +0000)]
Quick vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796502 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 28 May 2017 14:21:46 +0000 (14:21 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796500 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 14:15:32 +0000 (14:15 +0000)]
Improve proposal text.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796495 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 14:13:44 +0000 (14:13 +0000)]
Propose trivial ab patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796494 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 May 2017 05:06:52 +0000 (05:06 +0000)]
Add a missing ':'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796474 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 21:13:55 +0000 (21:13 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796454 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 21:12:39 +0000 (21:12 +0000)]
revert r1796447, this should be RTC.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796453 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:21:00 +0000 (20:21 +0000)]
add CHANGES meant for r1788447
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796450 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:18:02 +0000 (20:18 +0000)]
bad conflict edit in r1796447
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796449 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:16:14 +0000 (20:16 +0000)]
Merge r1796446 from trunk:
PR61124: ap_parse_form_data() EBCDIC fix
URL-decoding doesn't work on EBCDIC.
Submitted By: Hank Ibell <hwibell gmail.com>
(CTR for EBCDIC fix)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796447 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 May 2017 13:04:12 +0000 (13:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796393 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 May 2017 13:03:34 +0000 (13:03 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796392 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:41:48 +0000 (21:41 +0000)]
propose test_char fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796351 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:37:25 +0000 (21:37 +0000)]
propose ap_get_basic_auth_pw for 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796349 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:14:00 +0000 (21:14 +0000)]
propose + 2 straightforward votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796344 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 May 2017 16:35:32 +0000 (16:35 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796300 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 May 2017 16:17:17 +0000 (16:17 +0000)]
fix confusing indentation of examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796297 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 25 May 2017 13:36:39 +0000 (13:36 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796152 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 25 May 2017 13:34:54 +0000 (13:34 +0000)]
Merge r1796135 from trunk:
Remove warning about nested If/ElseIf/Else evaluation
As noted by Christophe Jaillet in the dev@ ml nested
if/elseif/else conditions are now evaluated. The code
change has been already backported to 2.4.x.
Submitted by: elukey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796151 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 25 May 2017 13:19:37 +0000 (13:19 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796150 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 25 May 2017 06:22:58 +0000 (06:22 +0000)]
Backport r1772559, r1774492, r1774493, r1774505 + reorder section/module in order to synch with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796131 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 May 2017 12:53:35 +0000 (12:53 +0000)]
This was for some reason not folded in during the larger patchset,
which had been approved and committed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795908 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 May 2017 12:49:02 +0000 (12:49 +0000)]
Merge r1795830 from trunk:
ab: don't call malloc_init for OpenSSL 1.1.0
Patch by rjung.
The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems
when mixed with procedure linkage stubs with some toolchains (e.g. GCC).
OpenSSL's malloc implementation doesn't recognize that the PLT stub
points back to it, which leads to infinite recursion.
Since the 1.1.0 documentation states that calling this function
explicitly is no longer necessary except "in certain shared-library
situations"(?), get rid of it.
Submitted by: jchampion
Reviewed by: jchampion, ylavic, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795907 13f79535 -47bb-0310-9956-
ffa450edef68