]> granicus.if.org Git - apache/log
apache
6 years agoTag HEAD of 2.4.x as 2.4.32 tags/2.4.32 2.4.32
Daniel Ruggeri [Sat, 10 Mar 2018 02:33:26 +0000 (02:33 +0000)]
Tag HEAD of 2.4.x as 2.4.32

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.4.32@1826390 13f79535-47bb-0310-9956-ffa450edef68

6 years agoGet ready to tag httpd 2.4.32
Daniel Ruggeri [Sat, 10 Mar 2018 02:33:21 +0000 (02:33 +0000)]
Get ready to tag httpd 2.4.32

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

6 years agoUpdate mergeinfo only: r1487775 was merged (indirectly) from
Joe Orton [Fri, 9 Mar 2018 10:59:45 +0000 (10:59 +0000)]
Update mergeinfo only: r1487775 was merged (indirectly) from
trunk to 2.4.x in r1824187.

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

6 years agoUpdate mergeinfo only: 1374214,1374216,1375445,1467593 were merged
Joe Orton [Fri, 9 Mar 2018 10:53:54 +0000 (10:53 +0000)]
Update mergeinfo only: 1374214,1374216,1375445,1467593 were merged
from trunk to 2.4.x in r1476685.

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

6 years agoAdd a missing word in the French translation
Christophe Jaillet [Fri, 9 Mar 2018 10:39:24 +0000 (10:39 +0000)]
Add a missing word in the French translation
(r1826318 in trunk)

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

6 years ago-tabs
Yann Ylavic [Fri, 9 Mar 2018 09:52:17 +0000 (09:52 +0000)]
-tabs

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

6 years agoRevival (while being discussed :p ).
Yann Ylavic [Fri, 9 Mar 2018 09:49:26 +0000 (09:49 +0000)]
Revival (while being discussed :p ).

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

6 years agoMerged*4, thx for reviews!
Joe Orton [Fri, 9 Mar 2018 09:25:08 +0000 (09:25 +0000)]
Merged*4, thx for reviews!

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

6 years agoMerge r1617913 from trunk:
Joe Orton [Fri, 9 Mar 2018 09:24:30 +0000 (09:24 +0000)]
Merge r1617913 from trunk:

* support/ab.c: Fix crash caused by integer overflow when printing stats with
lot of requests (for example -n 500000000).

Submitted by: jkaluza
Reviewed by: jorton, jim, ylavic

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

6 years agoMerge r1667676, r1826207 from trunk:
Joe Orton [Fri, 9 Mar 2018 09:19:44 +0000 (09:19 +0000)]
Merge r1667676, r1826207 from trunk:

* mod_access_compat, mod_authz_host: Handle '#' character.
For mod_access_compat, disable '#' in hostname completely.
For mod_authz_host, treat '#' as a comment and ignore everything after that.
This allows better handling of admin errors like
'Require host localhost# Add example.com later'.

* modules/aaa/mod_authz_host.c (host_check_authorization): Simplify
  comment stripping in "Require host"; log a warning if a comment is
  used in 'Require host', or an error if the expression is empty with
  the comment stripped. (Currently in 2.4, #comment part is parsed)

Submitted by: jkaluza, jorton
Reviewed by: jorton, jim, ylavic

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

6 years agoMerge r1532281, r1532289, r1537718 from trunk:
Joe Orton [Fri, 9 Mar 2018 09:09:38 +0000 (09:09 +0000)]
Merge r1532281, r1532289, r1537718 from trunk:

* support/rotatelogs.c (get_now): Return the offset applied to the
  Unix time as a parameter.
  (doRotate): When exploding the time for strtfime formatting, iff in
  -l mode, subtract the offset and explode the real Unix time as a
  local time so %Z etc works correctly.

* support/rotatelogs.c (get_now): Fix the NULL ptr dereferences
  added in r1532281.

* support/rotatelogs.c: Introduce an adjusted_time_t type to store the
  weird "adjusted time since epoch" type returned by get_now().
  Switch from int to long to fix an unnecessary Y2K38 issue.  Adjust
  use throughout and clean up other type issues.  No functional change
  intended apart from fixing Y2K38.

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

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

6 years agoMerge r1811976 from trunk:
Joe Orton [Fri, 9 Mar 2018 07:55:27 +0000 (07:55 +0000)]
Merge r1811976 from trunk:

Add optional _RAW suffix to SSL_*_DN_xx attribute names, allowing
users to convert an attribute value without conversion to UTF-8.  (A
public CA has issued certs with attributes tagged as the wrong ASN.1
string types.)

* modules/ssl/ssl_util_ssl.c (asn1_string_convert): Rename from
  asn1_string_to_utf8; add raw argument. Reimplement _to_utf8 as
  macro.
  (modssl_X509_NAME_ENTRY_to_string): Add raw argument.

* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Use raw
  string conversion if _RAW suffix is present in DN component.

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

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

6 years agoUpdate link (STALLED, but seems related to PR 62167, should we discuss it...).
Yann Ylavic [Thu, 8 Mar 2018 22:56:57 +0000 (22:56 +0000)]
Update link (STALLED, but seems related to PR 62167, should we discuss it...).

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

6 years agoVote, promote.
Yann Ylavic [Thu, 8 Mar 2018 22:16:12 +0000 (22:16 +0000)]
Vote, promote.

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

6 years agoVote, promote.
Yann Ylavic [Thu, 8 Mar 2018 22:00:21 +0000 (22:00 +0000)]
Vote, promote.

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

6 years agoBackport votes
Jim Jagielski [Thu, 8 Mar 2018 15:40:42 +0000 (15:40 +0000)]
Backport votes

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

6 years agoPropose.
Joe Orton [Thu, 8 Mar 2018 12:33:42 +0000 (12:33 +0000)]
Propose.

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

6 years agoPropose.
Joe Orton [Wed, 7 Mar 2018 20:18:35 +0000 (20:18 +0000)]
Propose.

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

6 years agoPropose.
Joe Orton [Wed, 7 Mar 2018 20:10:59 +0000 (20:10 +0000)]
Propose.

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

6 years agoPropose.
Joe Orton [Wed, 7 Mar 2018 19:34:21 +0000 (19:34 +0000)]
Propose.

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

6 years agoUpdate mergeinfo only: r1735891 was merged to 2.4.x in r1787728.
Joe Orton [Tue, 6 Mar 2018 10:57:36 +0000 (10:57 +0000)]
Update mergeinfo only: r1735891 was merged to 2.4.x in r1787728.

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

6 years agoNote that 2.4.32 is in development
Daniel Ruggeri [Mon, 5 Mar 2018 14:59:13 +0000 (14:59 +0000)]
Note that 2.4.32 is in development

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

6 years agoAdd mergeinfo for r1825839.
Yann Ylavic [Mon, 5 Mar 2018 14:53:45 +0000 (14:53 +0000)]
Add mergeinfo for r1825839.

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

6 years agoSorry, 2.4.31. It just isn't your day.
Daniel Ruggeri [Mon, 5 Mar 2018 02:17:51 +0000 (02:17 +0000)]
Sorry, 2.4.31. It just isn't your day.

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

6 years agobackported
Eric Covener [Sun, 4 Mar 2018 22:56:53 +0000 (22:56 +0000)]
backported

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

6 years agoab: Fix send length calculation
Eric Covener [Sun, 4 Mar 2018 22:56:42 +0000 (22:56 +0000)]
ab: Fix send length calculation

... for the non-blocking connect case introduced in 2.4.30.

Submitted By: jorton
Reviewed By: ylavic, druggeri, covener

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

6 years agovote
Eric Covener [Sun, 4 Mar 2018 22:54:07 +0000 (22:54 +0000)]
vote

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

6 years agoEasy to test vote for ab fix
Daniel Ruggeri [Sun, 4 Mar 2018 22:39:00 +0000 (22:39 +0000)]
Easy to test vote for ab fix

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

6 years agoab fix is actually a show stopper.
Yann Ylavic [Sun, 4 Mar 2018 19:19:11 +0000 (19:19 +0000)]
ab fix is actually a show stopper.

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

6 years agoThis mod_dav proposal needs more work (addressing -1).
Yann Ylavic [Sun, 4 Mar 2018 19:17:25 +0000 (19:17 +0000)]
This mod_dav proposal needs more work (addressing -1).

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

6 years agoPropose fix for ab defect detected in 2.4.31.
Yann Ylavic [Sun, 4 Mar 2018 19:12:29 +0000 (19:12 +0000)]
Propose fix for ab defect detected in 2.4.31.

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

6 years agoPost 2.4.31 tag updates
Daniel Ruggeri [Sat, 3 Mar 2018 15:53:13 +0000 (15:53 +0000)]
Post 2.4.31 tag updates

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

6 years agoGet ready to tag httpd 2.4.31
Daniel Ruggeri [Sat, 3 Mar 2018 15:53:06 +0000 (15:53 +0000)]
Get ready to tag httpd 2.4.31

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

6 years ago*) mod_proxy_fcgi: Add the support for the mod_proxy's flushpackets parameter.
Daniel Ruggeri [Sat, 3 Mar 2018 14:31:14 +0000 (14:31 +0000)]
*) mod_proxy_fcgi: Add the support for the mod_proxy's flushpackets parameter.
  trunk patch: http://svn.apache.org/r1802040
               http://svn.apache.org/r1807876
               http://svn.apache.org/r1808014
               http://svn.apache.org/r1805490
               http://svn.apache.org/r1823886
  2.4.x: svn merge -c 1802040,1807876,1808014,1805490,1823886 ^/httpd/httpd/trunk .
  +1: elukey, jim, ylavic
  elukey: this patch has been requested a couple of times in the users@ mailing list,
          but from my tests in trunk the async/set-aside core features would already
          do the job without the need of this patch. I am proposing the backport
          to allow more users to migrate away from mod_fastcgi.

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

6 years agofix properties and update transformation
André Malo [Sat, 3 Mar 2018 13:08:07 +0000 (13:08 +0000)]
fix properties and update transformation

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

6 years agoMerge r1802040, r1807876, r1808014, r1805490, r1823886 from trunk:
Yann Ylavic [Sat, 3 Mar 2018 12:18:37 +0000 (12:18 +0000)]
Merge r1802040, r1807876, r1808014, r1805490, r1823886 from trunk:

mod_proxy_fcgi: Add the support for mod_proxy's
                flushpackets and flushwait params

This change was requested on the development mailing
list in order to fill another gap between mod_fcgi
and mod_proxy_fcgi, namely the -flush funtionality.

The more evolved core trunk code would not need this
feature becuse of the non-blocking writes, but it
is be needed in 2.4.x.

mod_proxy_fcgi: limit the flush buckets inserted when flushpackets=on|auto

This commit is a follow up of r1802040 based on Jacob's
feedback, namely inserting the FLUSH buckets only when
really needed and useful, not always.

mod_proxy_fcgi: follow up to r1807876.
Fix mixed declarations and code [-Wdeclaration-after-statement].

Fix a compilation warning introduced by r1802040.
mod_proxy_fcgi.c:893:19: warning: ‘flushpoll’ may be used uninitialized in this function [-Wmaybe-uninitialized]

This warning is a false positive.

mod_proxy_fcgi: prioritize the check for mayflush when using flushpackets

The mayflush variable should be checked before the rest
to avoid polling when not needed.

Suggested by Yann Ylavic on the dev@ mailing list.

Submitted by: elukey, ylavic, jailletc36, elukey
Reviewed by: elukey, jim, ylavic

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

6 years agoVote, promote.
Yann Ylavic [Sat, 3 Mar 2018 12:14:44 +0000 (12:14 +0000)]
Vote, promote.

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

6 years agoMerge r1825169 from trunk:
Jim Jagielski [Fri, 2 Mar 2018 12:59:58 +0000 (12:59 +0000)]
Merge r1825169 from trunk:

Propose backportable fix to accept libxml2 path in the
base form or the absolute path to include tree form.

Nowhere does the --with-libxml2= arg suggest the path
is that of the include tree, and disagrees with httpd's
use of --with- syntax for package location.

Submitted by: wrowe
Reviewed by: wrowe, ylavic, jim

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

6 years agobackport promote
Jim Jagielski [Fri, 2 Mar 2018 12:59:15 +0000 (12:59 +0000)]
backport promote

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

6 years agobackport vote
Jim Jagielski [Fri, 2 Mar 2018 12:58:53 +0000 (12:58 +0000)]
backport vote

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

6 years agoDone.
Joe Orton [Thu, 1 Mar 2018 09:30:02 +0000 (09:30 +0000)]
Done.

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

6 years agoMerge r1825147 from trunk:
Joe Orton [Thu, 1 Mar 2018 09:29:47 +0000 (09:29 +0000)]
Merge r1825147 from trunk:

* modules/lua/config.m4: Use liblua paths from pkg-config if
  available.

Reviewed by: wrowe, ylavic, jorton

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

6 years agoVote.
Joe Orton [Thu, 1 Mar 2018 09:28:14 +0000 (09:28 +0000)]
Vote.

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

6 years agoBackport r1825504; fix missing util_debug.c omitted from CMakeLists.txt
William A. Rowe Jr [Tue, 27 Feb 2018 21:37:19 +0000 (21:37 +0000)]
Backport r1825504; fix missing util_debug.c omitted from CMakeLists.txt

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

6 years agoBackport r1825467.
Graham Leggett [Tue, 27 Feb 2018 16:03:33 +0000 (16:03 +0000)]
Backport r1825467.
Fix the version number in the docs to match the real release.

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

6 years agoBackport r1825370:
Graham Leggett [Mon, 26 Feb 2018 13:38:56 +0000 (13:38 +0000)]
Backport r1825370:
rpm: Add mod_proxy_uwsgi to the RPM package.

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

6 years agoBackport 1825368:
Graham Leggett [Mon, 26 Feb 2018 13:26:50 +0000 (13:26 +0000)]
Backport 1825368:
rpm: Remove rpm build for mod_socache_dc, the dependency distcache has long since
stopped being available in RPM distros.

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

6 years agoRebuild.
Lucien Gentis [Sat, 24 Feb 2018 14:35:42 +0000 (14:35 +0000)]
Rebuild.

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

6 years agoXML update.
Lucien Gentis [Sat, 24 Feb 2018 14:34:28 +0000 (14:34 +0000)]
XML update.

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

6 years agoVotes.
Yann Ylavic [Fri, 23 Feb 2018 20:34:51 +0000 (20:34 +0000)]
Votes.

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

6 years agoPropose small ./configure bandaids
William A. Rowe Jr [Fri, 23 Feb 2018 20:29:14 +0000 (20:29 +0000)]
Propose small ./configure bandaids

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

6 years agoFollow up to r1824974: add mergeinfo.
Yann Ylavic [Wed, 21 Feb 2018 15:52:21 +0000 (15:52 +0000)]
Follow up to r1824974: add mergeinfo.

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

6 years agoCorrectly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch]
William A. Rowe Jr [Wed, 21 Feb 2018 14:56:38 +0000 (14:56 +0000)]
Correctly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch]
and correct LICENSE/NOTICE to match.

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

6 years agobackport vote
Jim Jagielski [Wed, 21 Feb 2018 13:18:59 +0000 (13:18 +0000)]
backport vote

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

6 years agoDocumentation rebuild
Luca Toscano [Wed, 21 Feb 2018 10:12:43 +0000 (10:12 +0000)]
Documentation rebuild

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

6 years agomod_ssl.xml: remove <override>Not applicable</override>
Luca Toscano [Wed, 21 Feb 2018 10:10:43 +0000 (10:10 +0000)]
mod_ssl.xml: remove <override>Not applicable</override>

These tags generate a "Not applicable" section in
docs/manual/mod/overrides.html that doesn't make a lot of
sense, plus it breaks ./build.sh validate-xhtml.

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

6 years ago* Have a veto here. Sorry
Ruediger Pluem [Wed, 21 Feb 2018 07:12:40 +0000 (07:12 +0000)]
* Have a veto here. Sorry

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

6 years agoNote that 2.4.30 will not be released
Daniel Ruggeri [Tue, 20 Feb 2018 14:36:30 +0000 (14:36 +0000)]
Note that 2.4.30 will not be released

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

6 years agoAdd missing end tag
Daniel Ruggeri [Tue, 20 Feb 2018 13:51:47 +0000 (13:51 +0000)]
Add missing end tag

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

6 years agoPropose
Luca Toscano [Tue, 20 Feb 2018 13:51:12 +0000 (13:51 +0000)]
Propose

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

6 years agoBackported in r1824879.
Yann Ylavic [Tue, 20 Feb 2018 13:43:34 +0000 (13:43 +0000)]
Backported in r1824879.

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

6 years agoMerge r1823047, r1824454, r1824463, r1824464, r1824497, r1824862, r1824877 from trunk:
Yann Ylavic [Tue, 20 Feb 2018 13:42:59 +0000 (13:42 +0000)]
Merge r1823047, r1824454, r1824463, r1824464, r1824497, r1824862, r1824877 from trunk:

mpm_event: move lingering close "sucker" from the listener to worker(s).

This was the last non-constant time action performed by the listener thread.

It's now handled by the worker thread directly after entering lingering close,
which should directly address the cases when the socket is already closed
remotely at that time, hence avoid more scheduling (it may be the common case
for some scenarios).

And it's only if the above would need blocking (i.e. more data to suck) that
the socket is added to the pollset for the listener to re-schedule a worker
later when ready. If no worker is available at that time then the socket is
forcibly closed (similarly to what's done for keepalive connections in this
case).

Also, since process_lingering_close() is now called by a worker thread and
with almost no depth in the call stack, we can grow the size of the "suck"
buffer from 2K to 32K to potentially call recv() up to sixteen times less.

mpm_event: follow up to r1823047.

Update clogged counter on read_request retry too.

mpm_event: follow up to r1823047: simplify "clogging" logic (reentrance).

mpm_event: follow up to r1823047: complete state validation after processing.

mpm_event: follow up to r1823047: CHANGES entry.

mpm_event: follow up to r1823047 and r1824464.

MMN bump for CONN_STATE_NUM, plus don't consider CONN_STATE_LINGER_* as valid
states returned process_connection (never have been).

mpm_event: follow up to r1823047 and r1824862.

Revert (broken) functional change from r1824862.

Submitted by: ylavic
Reviewed by: ylavic, minfrin, jim

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

6 years agoRevert r1824868 (and r1824869).
Yann Ylavic [Tue, 20 Feb 2018 13:16:10 +0000 (13:16 +0000)]
Revert r1824868 (and r1824869).

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

6 years agoBackported in r1824872.
Yann Ylavic [Tue, 20 Feb 2018 13:03:37 +0000 (13:03 +0000)]
Backported in r1824872.

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

6 years agoMerge r1824811 from trunk:
Yann Ylavic [Tue, 20 Feb 2018 13:02:54 +0000 (13:02 +0000)]
Merge r1824811 from trunk:

10 years after r567503 , fix this properly.

The lock is created in post_config, so we can't copy it
around in a merge_server_config() callback.

Submitted by: covener
Reviewed by: covener, rpluem, jim

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

6 years agoOn the 2.4.x branch:
Stefan Eissing [Tue, 20 Feb 2018 13:00:39 +0000 (13:00 +0000)]
On the 2.4.x branch:

Merged r1820464 from trunk.

elukey: mod_md update to current certifcate agreement URL.

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

6 years agoBackported in r1824868.
Yann Ylavic [Tue, 20 Feb 2018 12:57:00 +0000 (12:57 +0000)]
Backported in r1824868.

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

6 years agoMerge r1823047, r1824454, r1824463, r1824464, r1824497, r1824862 from trunk:
Yann Ylavic [Tue, 20 Feb 2018 12:56:16 +0000 (12:56 +0000)]
Merge r1823047, r1824454, r1824463, r1824464, r1824497, r1824862 from trunk:

mpm_event: move lingering close "sucker" from the listener to worker(s).

This was the last non-constant time action performed by the listener thread.

It's now handled by the worker thread directly after entering lingering close,
which should directly address the cases when the socket is already closed
remotely at that time, hence avoid more scheduling (it may be the common case
for some scenarios).

And it's only if the above would need blocking (i.e. more data to suck) that
the socket is added to the pollset for the listener to re-schedule a worker
later when ready. If no worker is available at that time then the socket is
forcibly closed (similarly to what's done for keepalive connections in this
case).

Also, since process_lingering_close() is now called by a worker thread and
with almost no depth in the call stack, we can grow the size of the "suck"
buffer from 2K to 32K to potentially call recv() up to sixteen times less.

mpm_event: follow up to r1823047.

Update clogged counter on read_request retry too.

mpm_event: follow up to r1823047: simplify "clogging" logic (reentrance).

mpm_event: follow up to r1823047: complete state validation after processing.

mpm_event: follow up to r1823047: CHANGES entry.

mpm_event: follow up to r1823047 and r1824464.

MMN bump for CONN_STATE_NUM, plus don't consider CONN_STATE_LINGER_* as valid
states returned process_connection (never have been).

Submitted by: ylavic
Reviewed by: ylavic, minfrin, jim

[Reverted by r1824874]

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

6 years agoBackported in r1824866.
Yann Ylavic [Tue, 20 Feb 2018 12:50:41 +0000 (12:50 +0000)]
Backported in r1824866.

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

6 years agoMerge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639...
Yann Ylavic [Tue, 20 Feb 2018 12:49:53 +0000 (12:49 +0000)]
Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639, r1821644, r1821647, r1821648, r1821649, r1821650, r1821651, r1821659, r1821660, r1822366, r1822367, r1824381 from trunk:

Shared fdqueue code between MPMs event and worker into mpm_fdqueue.

This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.

mpm_fdqueue: follow up to r1821624.

And now it's mpm_fdqueue, with minimal #includes.

mpm_fdqueue: follow up to r1821624.

Opacify fdqueue types.

mpm_fdqueue: follow up to r1821624.

Style, no functional change.

mpm_fdqueue: follow up to r1821624.

Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().

mpm_fdqueue: follow up to r1821624.

Clear recycled_pools_count in ap_free_idle_pools().

mpm_fdqueue: follow up to r1821624.

Prepare mpm_worker to use common fdqueue.

mpm_worker: follow up to r1821624.

Use common [mpm_]fdqueue.

mpm_fdqueue: follow up to r1821624.

The implemention wants APR_HAS_THREADS too.

mpm_fdqueue: follow up to r1821624.

The code is not part of the API.

mpm_fdqueue: follow up to r1821624.

Fix typo in comment.

mpm_fdqueue: follow up to r1821624.

Cosmetics, 80 cols, no functional change.

mpm_worker: follow up to r1821624.

Free idle pools while stopping.

mpm_fdqueue: follow up to r1821624.

Be explicit in the naming about what's push/pop-ed.

mpm_fdqueue: follow up to r1821624.

Either error matters, simplify code.

mpm_fdqueue: follow up to r1821624.

Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().

mpm_fdqueue: follow up to r1821624.

Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).

mpm_fdqueue: follow up to r1821624.

80 colums.

Follow up to r1821624: CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, minfrin, jim

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

6 years agoFollow up to r1821624: sync with latest 2.4.x.
Yann Ylavic [Tue, 20 Feb 2018 12:43:16 +0000 (12:43 +0000)]
Follow up to r1821624: sync with latest 2.4.x.

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

6 years agoPromote.
Yann Ylavic [Tue, 20 Feb 2018 12:34:17 +0000 (12:34 +0000)]
Promote.

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

6 years agoBackport vote
Jim Jagielski [Tue, 20 Feb 2018 12:03:34 +0000 (12:03 +0000)]
Backport vote

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

6 years ago* Vote
Ruediger Pluem [Tue, 20 Feb 2018 06:52:26 +0000 (06:52 +0000)]
* Vote

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

6 years agomod_proxy_uwsgi Win32 builds
Gregg Lewis Smith [Mon, 19 Feb 2018 22:47:28 +0000 (22:47 +0000)]
mod_proxy_uwsgi Win32 builds
IDE Add project to workspace/solution.
Add the missing pieces for command line build and connect the dots

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

6 years agoFollow up r1824709 for command line build which is not in trunk
Gregg Lewis Smith [Mon, 19 Feb 2018 22:10:01 +0000 (22:10 +0000)]
Follow up r1824709 for command line build which is not in trunk

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

6 years agoSuggest ways to install on common platforms
Rich Bowen [Mon, 19 Feb 2018 21:33:01 +0000 (21:33 +0000)]
Suggest ways to install on common platforms

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

6 years agoLDAP cache fix
Eric Covener [Mon, 19 Feb 2018 20:57:10 +0000 (20:57 +0000)]
LDAP cache fix

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

6 years agoBackport votes... not promoting those with 3 in case we
Jim Jagielski [Mon, 19 Feb 2018 18:11:38 +0000 (18:11 +0000)]
Backport votes... not promoting those with 3 in case we
decide to do another T&R for 2.4.31 to correct some
process flaws/inconsistencies

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

6 years agoAnd any changes will be in 2.4.31
Jim Jagielski [Mon, 19 Feb 2018 18:09:19 +0000 (18:09 +0000)]
And any changes will be in 2.4.31

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

6 years agoFluff from 2.4.30 tagging...
Jim Jagielski [Mon, 19 Feb 2018 18:08:52 +0000 (18:08 +0000)]
Fluff from 2.4.30 tagging...

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

6 years agoPost 2.4.30 tag updates
Daniel Ruggeri [Mon, 19 Feb 2018 14:18:51 +0000 (14:18 +0000)]
Post 2.4.30 tag updates

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

6 years agoadd mod_proxy_uwsgi.so to windows build
Steffen Land [Mon, 19 Feb 2018 11:18:12 +0000 (11:18 +0000)]
add mod_proxy_uwsgi.so to windows build

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

6 years agoreverting current backport proposal for SSLPolicy
Stefan Eissing [Mon, 19 Feb 2018 09:23:40 +0000 (09:23 +0000)]
reverting current backport proposal for SSLPolicy

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

6 years agobackport r1821581 fixes to mod_remoteip.dsp
Eric Covener [Sun, 18 Feb 2018 21:04:37 +0000 (21:04 +0000)]
backport r1821581 fixes to mod_remoteip.dsp

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

6 years agoUpdate proposal.
Graham Leggett [Sat, 17 Feb 2018 14:36:39 +0000 (14:36 +0000)]
Update proposal.

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

6 years agoapr-util v1.6 has been released.
Graham Leggett [Sat, 17 Feb 2018 14:08:02 +0000 (14:08 +0000)]
apr-util v1.6 has been released.

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

6 years agoUpdate proposal with fix for rpluem/jorton.
Graham Leggett [Sat, 17 Feb 2018 14:06:20 +0000 (14:06 +0000)]
Update proposal with fix for rpluem/jorton.

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

6 years agoVote.
Graham Leggett [Sat, 17 Feb 2018 13:17:59 +0000 (13:17 +0000)]
Vote.

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

6 years agoUpdate comment.
Graham Leggett [Fri, 16 Feb 2018 16:47:26 +0000 (16:47 +0000)]
Update comment.

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

6 years agoMore comment.
Yann Ylavic [Fri, 16 Feb 2018 16:44:02 +0000 (16:44 +0000)]
More comment.

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

6 years agoComment.
Yann Ylavic [Fri, 16 Feb 2018 16:41:00 +0000 (16:41 +0000)]
Comment.

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

6 years agoComment.
Graham Leggett [Fri, 16 Feb 2018 16:38:02 +0000 (16:38 +0000)]
Comment.

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

6 years agoRebuild.
Lucien Gentis [Fri, 16 Feb 2018 16:00:18 +0000 (16:00 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Fri, 16 Feb 2018 15:59:21 +0000 (15:59 +0000)]
XML updates.

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

6 years agofixed patch for sslpolicy
Stefan Eissing [Fri, 16 Feb 2018 15:46:14 +0000 (15:46 +0000)]
fixed patch for sslpolicy

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

6 years agoClarification about MMN bump not needed.
Yann Ylavic [Fri, 16 Feb 2018 15:09:20 +0000 (15:09 +0000)]
Clarification about MMN bump not needed.

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

6 years agoBackported in r1824504.
Yann Ylavic [Fri, 16 Feb 2018 15:05:13 +0000 (15:05 +0000)]
Backported in r1824504.

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

6 years agoMerge r1824176, r1824460, r1824482 from trunk:
Yann Ylavic [Fri, 16 Feb 2018 15:04:41 +0000 (15:04 +0000)]
Merge r1824176, r1824460, r1824482 from trunk:

mod_proxy: Provide an RFC1035 compliant version of the hostname in the
proxy_worker_shared structure. PR62085

Tone down the message that worker hostname is too long noting it only
affects legacy modules not yet using hostname_ex.

Set the notice when hostname is too long for legacy proxy modules to info level.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

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

6 years agoFollow up to r1821624: sync with 2.4.x.
Yann Ylavic [Fri, 16 Feb 2018 14:56:15 +0000 (14:56 +0000)]
Follow up to r1821624: sync with 2.4.x.

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