]> granicus.if.org Git - apache/log
apache
6 years agoVote and promote
Christophe Jaillet [Tue, 12 Jun 2018 17:04:58 +0000 (17:04 +0000)]
Vote and promote

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

6 years agoRebuild.
Lucien Gentis [Sat, 9 Jun 2018 14:35:25 +0000 (14:35 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Sat, 9 Jun 2018 14:34:40 +0000 (14:34 +0000)]
XML updates.

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

6 years agoNominate r1833014.
Joe Orton [Fri, 8 Jun 2018 16:35:21 +0000 (16:35 +0000)]
Nominate r1833014.

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

6 years agoMerge r1832580, r1832581 from trunk:
Jim Jagielski [Wed, 6 Jun 2018 19:04:45 +0000 (19:04 +0000)]
Merge r1832580, r1832581 from trunk:

mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

Overwriting server config in pre_config hook breaks EXEC_ON_READ directives,
it's automatically created on purpose anyway.

PR 62220.

Follow up to r1832580: correct CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, wrowe, jim

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

6 years agopromote
Jim Jagielski [Wed, 6 Jun 2018 19:02:50 +0000 (19:02 +0000)]
promote

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

6 years agovote on showstopper
Jim Jagielski [Wed, 6 Jun 2018 19:02:35 +0000 (19:02 +0000)]
vote on showstopper

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

6 years agoBackported to 2.4.x in r1833007.
Yann Ylavic [Wed, 6 Jun 2018 10:57:13 +0000 (10:57 +0000)]
Backported to 2.4.x in r1833007.

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

6 years agoMerge r1776458 from trunk:
Yann Ylavic [Wed, 6 Jun 2018 10:56:19 +0000 (10:56 +0000)]
Merge r1776458 from trunk:

mod_remoteip: Set useragent port to zero PR59931

When overriding the useragent address from X-Forwarded-For,
zero out what had been initialized as the connection-level port.

Submitted By: Hank Ibell <hwibell gmail.com>
Reviewed by: ylavic, covener, icing

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

6 years agoBackported to 2.4.x in r1833005.
Yann Ylavic [Wed, 6 Jun 2018 10:53:54 +0000 (10:53 +0000)]
Backported to 2.4.x in r1833005.

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

6 years agoMerge r1822537, r1830744 from trunk:
Yann Ylavic [Wed, 6 Jun 2018 10:53:16 +0000 (10:53 +0000)]
Merge r1822537, r1830744 from trunk:

mpm_unix(es): cleanup properly on exit in one_process mode.

We can't destroy ap_pglobal in the MPMs because clean_child_exit() runs in
a DSO which would be unloaded under us.

So we defer an ap_terminate() with atexit() in ap_unixd_mpm_set_signals(),
all this is static/builtin code in "os/unix/unixd.c".

Follow up to r1822537: replace static variable with pool userdata.

Also adds a comment and a CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, jim, icing

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

6 years agopromote
Stefan Eissing [Wed, 6 Jun 2018 10:32:41 +0000 (10:32 +0000)]
promote

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

6 years agovote
Stefan Eissing [Wed, 6 Jun 2018 10:32:17 +0000 (10:32 +0000)]
vote

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

6 years agovote
Stefan Eissing [Wed, 6 Jun 2018 10:31:59 +0000 (10:31 +0000)]
vote

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

6 years agoAgree with Stefan (clearing Christophe's vote).
Yann Ylavic [Wed, 6 Jun 2018 10:04:24 +0000 (10:04 +0000)]
Agree with Stefan (clearing Christophe's vote).

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

6 years agoremoving SSLPolicy backport proposal
Stefan Eissing [Wed, 6 Jun 2018 09:57:03 +0000 (09:57 +0000)]
removing SSLPolicy backport proposal

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

6 years agovote
Stefan Eissing [Wed, 6 Jun 2018 09:25:44 +0000 (09:25 +0000)]
vote

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

6 years agoUse define for serverroot with Windows conf files.
Steffen Land [Tue, 5 Jun 2018 18:58:07 +0000 (18:58 +0000)]
Use define for serverroot with Windows conf files.

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

6 years agoanother followup to r1828485 needs mod_http2.h
Gregg Lewis Smith [Mon, 4 Jun 2018 14:51:36 +0000 (14:51 +0000)]
another followup to r1828485 needs mod_http2.h

cmake:
   add modules/http2 to includes

legacy:
    add mod_http2.h to install now that mod_proxy.h includes it

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

6 years agofollowup r1828485
Gregg Lewis Smith [Fri, 1 Jun 2018 18:57:21 +0000 (18:57 +0000)]
followup r1828485
needs mod_http2.h

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

6 years agoFix typo
Christophe Jaillet [Thu, 31 May 2018 19:14:06 +0000 (19:14 +0000)]
Fix typo

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

6 years agoPropose
Christophe Jaillet [Thu, 31 May 2018 19:03:05 +0000 (19:03 +0000)]
Propose

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

6 years agoRevert objection, the preconfig seems to have been a destructive no-op
William A. Rowe Jr [Thu, 31 May 2018 16:00:47 +0000 (16:00 +0000)]
Revert objection, the preconfig seems to have been a destructive no-op

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

6 years agoSoft -0, needing to clarify what changed with semantics, and what this breaks.
William A. Rowe Jr [Thu, 31 May 2018 15:44:20 +0000 (15:44 +0000)]
Soft -0, needing to clarify what changed with semantics, and what this breaks.

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

6 years agoTransforms.
Joe Orton [Thu, 31 May 2018 15:13:38 +0000 (15:13 +0000)]
Transforms.

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

6 years agoMerged, with compat note added in core.xml.
Joe Orton [Thu, 31 May 2018 15:11:18 +0000 (15:11 +0000)]
Merged, with compat note added in core.xml.

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

6 years agoMerge r1769718, r1785943, r1786110, r1786119 from trunk:
Joe Orton [Thu, 31 May 2018 15:10:26 +0000 (15:10 +0000)]
Merge r1769718, r1785943, r1786110, r1786119 from trunk:

add an <IfFile> config section like <IfDefine>

It allows a non httpd config file to be used as a marker directly in
httpd.conf without hiding logic in a script in front of apachectl
to do test -f and pass extra -D's.

This is something we've had in IBM's httpd distro for a little bit and
hadn't remembered to share. I've seen some questions/config files come
up in a few places lately that would benefit from this as an option.

Remove duplicate implementations of conditional section function.  No
functional change.

* server/core.c (start_cond_section): Factor out from start_if*.
  Adjust to use apr_strmemdup.
  (test_ifmod_section, test_iffile_section, test_ifdefine_section):
  Move container-specific tests into callbacks from start_if*.
  (core_cmds): Adjust <IfFile, <IfDefine, <IfModule to use
  start_cond_section with callbacks.

Add <IfDirective> and <IfSection>:

* server/core.c
  (test_ifdirective_section, test_ifsection_section): New callbacks.
  (core_cmds): Define new directives.

* include/http_config.h, server/config.c (ap_exists_directive):
  New function.

* include/ap_mmn.h: Bump MMN minor for above.

* docs/manual/mod/core.xml: Add docs.

* server/core.c (start_cond_section): Comment & variable name fixes,
  no functional change.

Submitted by: covener, jorton
Reviewed by: jorton, ylavic, covener

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

6 years agoAdd in userland change notice
Jim Jagielski [Thu, 31 May 2018 13:37:34 +0000 (13:37 +0000)]
Add in userland change notice

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

6 years agoxforms
Jim Jagielski [Thu, 31 May 2018 13:26:35 +0000 (13:26 +0000)]
xforms

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

6 years agoT&R proposal
Jim Jagielski [Thu, 31 May 2018 13:26:16 +0000 (13:26 +0000)]
T&R proposal

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

6 years agoMerge r1828890, r1832500 from trunk:
Jim Jagielski [Thu, 31 May 2018 13:24:04 +0000 (13:24 +0000)]
Merge r1828890, r1832500 from trunk:

mod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare members are
used as drop-in replacements for unusable workers in the same load balancer set. This differs
from hot standbys which are only used when all workers in a set are unusable. PR 61140.

mod_proxy_balancer: follow up to r1828890: indentation and 80 col.

Submitted by: jhriggs, ylavic
Reviewed by: jhriggs, jim, ylavic

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

6 years agopromote
Jim Jagielski [Thu, 31 May 2018 13:20:42 +0000 (13:20 +0000)]
promote

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

6 years agoMerge r1490294, r1734635, r1749403, r1813116, r1816179, r1817598, r1832198, r1832200...
Jim Jagielski [Thu, 31 May 2018 13:19:12 +0000 (13:19 +0000)]
Merge r1490294, r1734635, r1749403, r1813116, r1816179, r1817598, r1832198, r1832200, r1832277, r1832317 from trunk:

Note that the function will be available in APR.

Silent a smatch warning:
mod_auth_form.c:626 get_form_auth() warn: variable dereferenced before check 'sent_user' (see line 616)

Use 'memcpy' instead of 'strcpy' when the size of the string has already been computed.

Fix compilation failure :

unixd.c: In function ‘ap_unixd_mpm_set_signals’:
unixd.c:579:5: error: implicit declaration of function ‘apr_signal’; did you mean ‘strsignal’? [-Werror=implicit-function-declaration]
     apr_signal(SIGPIPE, SIG_IGN);
     ^~~~~~~~~~
     strsignal

Not sure where it comes from, maybe related to r1812301.

mod_substitute: add runtime traces. PR 61132.

In verify_ocsp_status in ssl_engine_ocsp.c, the log message, "OCSP response not successful: %d" should print the value of r instead of rc.
The value of rc will always be 0.

PR 61876 [sam <sam.eastman.4114 gmail.com>]

Success of 'SHGetMalloc()' should be tested with the SUCCEEDED macro.

/!\   This commit is _NOT COMPILE TESTED_. (I don't have a windows build environment available)

See PR 60086.

Axe some dead code.

See PR 60086.

Fix typo

Fix a potential un-intialized variable usage warning.
This can not be a runtime ixsue, because, in such a case, we would assert and abort before.

 PR 59819.
Submitted by: minfrin, jailletc36, jailletc36, jailletc36, ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed by: jailletc36, ylavic, covener

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

6 years agofix my confusion, move vote
Eric Covener [Thu, 31 May 2018 12:45:39 +0000 (12:45 +0000)]
fix my confusion, move vote

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

6 years agois in showstopper section too
Eric Covener [Thu, 31 May 2018 12:07:02 +0000 (12:07 +0000)]
is in showstopper section too

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

6 years agovote/promote
Eric Covener [Thu, 31 May 2018 12:06:37 +0000 (12:06 +0000)]
vote/promote

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

6 years agoPropose Hank/Eric's fix in mod_remoteip for PR 59931.
Yann Ylavic [Thu, 31 May 2018 07:54:26 +0000 (07:54 +0000)]
Propose Hank/Eric's fix in mod_remoteip for PR 59931.

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

6 years agoNew showstopper from PR 62220.
Yann Ylavic [Thu, 31 May 2018 07:43:08 +0000 (07:43 +0000)]
New showstopper from PR 62220.

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

6 years agoMerge r1830562 from trunk:
Jim Jagielski [Wed, 30 May 2018 19:13:36 +0000 (19:13 +0000)]
Merge r1830562 from trunk:

On the trunk:

mod_http2: restoring the v1.10.16 keepalive timeout behavioud of mod_http2 (to be verified).

ALSO: mod_http2: adding regular memory cleanup when transferring large response bodies. This
      reduces memory footprint and avoids memory exhaustion when transferring large files
      on 32-bit architectures. Fixes PR 62325.

Submitted by: icing
Reviewed by: icing, ylavic, jim

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

6 years agoMerge r1341905, r1342065, r1341930, r1345147, r1344712, r1814465 from trunk:
Jim Jagielski [Wed, 30 May 2018 19:09:00 +0000 (19:09 +0000)]
Merge r1341905, r1342065, r1341930, r1345147, r1344712, r1814465 from trunk:

suexec: Add support for logging to syslog as an alternative to a
logfile.

* support/suexec.c (err_output) [AP_LOG_SYSLOG]: Log to syslog.
  (main): Close syslog fd if open, before execv.  Add -V output
  for AP_LOG_SYSLOG.

* configure.in: Add --with-suexec-syslog argument; allow
  --without-suexec-logfile to omit definition of AP_LOG_EXEC.

suexec: Support use of setgid/setuid capability bits on Linux, a
weaker set of privileges than the full setuid/setgid root binary.

* configure.in: Add --enable-suexec-capabilites flag.

* Makefile.in: If configured, use setcap instead of chmod 7555 on
  installed suexec binary.

* modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for
  setuid bit if capability bits are used.

* docs/manual/: Add docs.

* docs/manual/suexec.html.en: Update for syslog logging.

* configure.in: Correct handling of --with-suexec-logfile in r1341905,
  thanks to rpluem.

* support/suexec.c: Define AP_LOG_FACILITY.
  (err_output): Use AP_LOG_FACILITY for syslog facility.

Suggested by: kbrand

* configure.in: Fix help text for --with-suexec-syslog.

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

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

6 years agopromote
Jim Jagielski [Wed, 30 May 2018 18:52:38 +0000 (18:52 +0000)]
promote

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

6 years agoTested and voted
Jim Jagielski [Wed, 30 May 2018 18:51:42 +0000 (18:51 +0000)]
Tested and voted

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

6 years agosome explanation for the SSLPolicy backport proposal
Stefan Eissing [Wed, 30 May 2018 13:52:20 +0000 (13:52 +0000)]
some explanation for the SSLPolicy backport proposal

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

6 years agoAlmost vote.
Yann Ylavic [Tue, 29 May 2018 22:04:43 +0000 (22:04 +0000)]
Almost vote.

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

6 years agoFix typo.
Yann Ylavic [Tue, 29 May 2018 21:39:44 +0000 (21:39 +0000)]
Fix typo.

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

6 years ago80 col and alignment.
Yann Ylavic [Tue, 29 May 2018 21:38:29 +0000 (21:38 +0000)]
80 col and alignment.

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

6 years agoBackported in r1832495.
Yann Ylavic [Tue, 29 May 2018 21:27:43 +0000 (21:27 +0000)]
Backported in r1832495.

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

6 years agoMerge r1829513 from trunk:
Yann Ylavic [Tue, 29 May 2018 21:27:15 +0000 (21:27 +0000)]
Merge r1829513 from trunk:

* modules/ssl/ssl_engine_init.c (ssl_init_Module): Don't enable SSL
  for a vhost if SSLEnable is not used and no certs are configured,
  even if the Listen protocol is "https".  Restores behaviour to that
  prior to r1809303 for configs which would now otherwise fail at
  startup.

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

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

6 years agoBackported in r1832493.
Yann Ylavic [Tue, 29 May 2018 21:24:48 +0000 (21:24 +0000)]
Backported in r1832493.

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

6 years agocore: use strncmp in check_errorlog_dir and core_dump_config when checking
Yann Ylavic [Tue, 29 May 2018 21:24:11 +0000 (21:24 +0000)]
core: use strncmp in check_errorlog_dir and core_dump_config when checking
if the ErrorLog directive is configured with the 'syslog' prefix. PR 62102

trunk patch: none, as far as I can see the code in trunk diverged too much
          due to the code in STALLED for ap_errorlog_provider.

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

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

6 years agoBackported in r1832491..
Yann Ylavic [Tue, 29 May 2018 21:20:09 +0000 (21:20 +0000)]
Backported in r1832491..

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

6 years agoMerge r1703248, r1827366 from trunk:
Yann Ylavic [Tue, 29 May 2018 21:19:30 +0000 (21:19 +0000)]
Merge r1703248, r1827366 from trunk:

core: Avoid a compiler warning when NO_LINGCLOSE is used (-Wunreachable-code).
Also, check c->aborted before apr_socket_shutdown() because it is set earlier,
and there is no point in calling shutdown() before close().

mod_ldap: fix format warnings.

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

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

6 years agoBackported in r1832489.
Yann Ylavic [Tue, 29 May 2018 21:17:00 +0000 (21:17 +0000)]
Backported in r1832489.

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

6 years agoMerge r1826687, r1827166, r1828210, r1828232, r1828687 from trunk:
Yann Ylavic [Tue, 29 May 2018 21:16:29 +0000 (21:16 +0000)]
Merge r1826687, r1827166, r1828210, r1828232, r1828687 from trunk:

Instrument 'bbout'

mod_http2: use proper ARP defined for formatting apr_off_t

On the trunk:

mod_http2: on level trace2, log any unsuccessful HTTP/2 direct connection upgrade
     with base64 encoding to unify its appearance in possible bug reports.

On the trunk:

* mod_http2: calculate unencrypted connection sniffing base64 only when log level is at required height. [Ruediger Pluem]

On the trunk:

mod_http2: accurate reporting of h2 data input/output per request via mod_logio. Fixes
     an issue where output sizes where counted n-times on reused slave connections. See
     gituhub issue: https://github.com/icing/mod_h2/issues/158

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

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

6 years agoBackported in r1832487.
Yann Ylavic [Tue, 29 May 2018 21:10:04 +0000 (21:10 +0000)]
Backported in r1832487.

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

6 years agoMerge r1828879 from trunk:
Yann Ylavic [Tue, 29 May 2018 21:09:31 +0000 (21:09 +0000)]
Merge r1828879 from trunk:

On the trunk:

mod_http2: always wake up any conditional waits when streams are aborted. Fixes race conditions where timeouts would trigger instead.

Submitted by: icing
Reviewed by: icing, jim, ylavic

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

6 years agoBackported in r1832485.
Yann Ylavic [Tue, 29 May 2018 21:07:20 +0000 (21:07 +0000)]
Backported in r1832485.

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

6 years agoMerge r1822849, r1822858, r1822878, r1822879, r1822883, r1828485, r1828493 from trunk:
Yann Ylavic [Tue, 29 May 2018 21:06:49 +0000 (21:06 +0000)]
Merge r1822849, r1822858, r1822878, r1822879, r1822883, r1828485, r1828493 from trunk:

* When mod_http2 is loaded more then ThreadsPerChild backend connections can
  be useful as mod_http2 has an additional thread pool on top of
  ThreadsPerChild.
  But leave the default with ThreadsPerChild.

* Add some some comment why we do not limit hmax any longer

mod_proxy: follow up to r1822849.

Get the help(er) of mod_http2 to determine how much connections should
be handled in the reslist by default (i.e. max_threads).

mod_proxy: follow up to r1822849 and r1822878.

Does r1822878's "static" APR_RETRIEVE_OPTIONAL_FN work if, say, mod_proxy is
builtin but mod_http2 isn't?

Not worth taking the risk here since it's not a fast path...

Note: if this is an issue, I'm afraid it applies elsewhere too.

mod_proxy: follow up to r1822849 and r1822879.

Fix my maths, thanks Stefan and Rüdiger!

needs mod_http2.h

* Add missing CHANGES entry for revisions 1822849,1822858,1822878,1822879,1822883,1828485

Submitted by: rpluem, ylavic, ylavic, ylavic, gsmith, rpluem
Reviewed by: rpluem, jim, ylavic

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

6 years agoChanges from Ruediger's review (slotmem_shm).
Yann Ylavic [Tue, 29 May 2018 20:32:41 +0000 (20:32 +0000)]
Changes from Ruediger's review (slotmem_shm).

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

6 years agoVote, promote.
Yann Ylavic [Tue, 29 May 2018 19:15:50 +0000 (19:15 +0000)]
Vote, promote.

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

6 years agoVote.
Yann Ylavic [Tue, 29 May 2018 19:12:25 +0000 (19:12 +0000)]
Vote.

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

6 years agoPromote.
Yann Ylavic [Tue, 29 May 2018 19:10:28 +0000 (19:10 +0000)]
Promote.

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

6 years agoVotes.
Yann Ylavic [Tue, 29 May 2018 19:08:42 +0000 (19:08 +0000)]
Votes.

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

6 years agoNot a showstopper.
Yann Ylavic [Tue, 29 May 2018 18:34:20 +0000 (18:34 +0000)]
Not a showstopper.

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

6 years agoPromote.
Yann Ylavic [Tue, 29 May 2018 18:33:26 +0000 (18:33 +0000)]
Promote.

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

6 years agoChecked and voted. Great job Yann!
Jim Jagielski [Tue, 29 May 2018 18:08:46 +0000 (18:08 +0000)]
Checked and voted. Great job Yann!

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

6 years agoHave code and doc consistent.
Christophe Jaillet [Sun, 27 May 2018 20:19:50 +0000 (20:19 +0000)]
Have code and doc consistent.
The SSLRandomSeed  builtin, uses 128 bytes of stack, not 1kb of scoreboard data.
(r1832346 in trunk)

See PR 54752

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

6 years agoPropose some easy votes to synch 2.4.x with trunk
Christophe Jaillet [Sun, 27 May 2018 16:54:26 +0000 (16:54 +0000)]
Propose some easy votes to synch 2.4.x with trunk

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

6 years agoRebuild.
Lucien Gentis [Sun, 27 May 2018 12:26:55 +0000 (12:26 +0000)]
Rebuild.

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

6 years agoXML update.
Lucien Gentis [Sun, 27 May 2018 12:26:09 +0000 (12:26 +0000)]
XML update.

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

6 years agoRe-send
Christophe Jaillet [Sat, 26 May 2018 08:55:19 +0000 (08:55 +0000)]
Re-send

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

6 years agorebuild
Christophe Jaillet [Sat, 26 May 2018 08:29:11 +0000 (08:29 +0000)]
rebuild

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

6 years agobackport r1817908 which fixes some example (see PR 61650) + make some cosmetic change...
Christophe Jaillet [Sat, 26 May 2018 08:21:19 +0000 (08:21 +0000)]
backport r1817908 which fixes some example (see PR 61650) + make some cosmetic changes (r1832294 in trunk)

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

6 years agoEasy vote
Christophe Jaillet [Tue, 22 May 2018 20:38:26 +0000 (20:38 +0000)]
Easy vote

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

6 years agoUpdate proposal
Christophe Jaillet [Tue, 22 May 2018 18:57:09 +0000 (18:57 +0000)]
Update proposal

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

6 years agoPropose
Christophe Jaillet [Tue, 22 May 2018 18:51:04 +0000 (18:51 +0000)]
Propose

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

6 years agoPropose backport for PR 62308, and comment about PR 62277.
Yann Ylavic [Tue, 22 May 2018 11:36:46 +0000 (11:36 +0000)]
Propose backport for PR 62308, and comment about PR 62277.

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

6 years agoupdate transformations.
Nilgun Belma Buguner [Tue, 8 May 2018 13:09:57 +0000 (13:09 +0000)]
update transformations.

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

6 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Tue, 8 May 2018 13:08:38 +0000 (13:08 +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@1831178 13f79535-47bb-0310-9956-ffa450edef68

6 years agoPropose.
Yann Ylavic [Wed, 2 May 2018 15:33:02 +0000 (15:33 +0000)]
Propose.

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

6 years agoPropose.
Yann Ylavic [Wed, 2 May 2018 11:20:28 +0000 (11:20 +0000)]
Propose.

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

6 years agoPropose backport of http2 keepalive restoration.
Stefan Eissing [Wed, 2 May 2018 08:47:08 +0000 (08:47 +0000)]
Propose backport of http2 keepalive restoration.

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

6 years agoPropose.
Yann Ylavic [Sun, 29 Apr 2018 22:20:03 +0000 (22:20 +0000)]
Propose.

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

6 years agodocumentation rebuild
Luca Toscano [Sun, 29 Apr 2018 06:06:52 +0000 (06:06 +0000)]
documentation rebuild

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

6 years agoadding backport proposal
Stefan Eissing [Sat, 28 Apr 2018 10:08:18 +0000 (10:08 +0000)]
adding backport proposal

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

6 years agoMerge r1828920 from trunk:
Jim Jagielski [Thu, 26 Apr 2018 17:35:44 +0000 (17:35 +0000)]
Merge r1828920 from trunk:

PR62186: preserve %<m for ErrorDocument internal redirects

  *) core: Preserve the original HTTP request method in the '%<m' LogFormat
     when an path-based ErrorDocument is used.  PR 62186.
     [Micha Lenk <micha lenk.info>]

Submitted By: Micha Lenk
Committed By: covener

Submitted by: covener
Reviewed by: covener, jhriggs, jim

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

6 years agopromote
Jim Jagielski [Thu, 26 Apr 2018 17:34:01 +0000 (17:34 +0000)]
promote

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

6 years agovotes
Jim Jagielski [Thu, 26 Apr 2018 17:33:22 +0000 (17:33 +0000)]
votes

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

6 years agoThese look like showstoppers to me.
Jim Jagielski [Thu, 26 Apr 2018 17:31:52 +0000 (17:31 +0000)]
These look like showstoppers to me.

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

6 years agoRebuild.
Lucien Gentis [Sat, 21 Apr 2018 16:11:03 +0000 (16:11 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Sat, 21 Apr 2018 16:08:05 +0000 (16:08 +0000)]
XML updates.

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

6 years agoImprove highlight and make these doc much more readable.
Christophe Jaillet [Fri, 20 Apr 2018 21:12:38 +0000 (21:12 +0000)]
Improve highlight and make these doc much more readable.

Use the "c" highlight for API description.

(r1829678 in trunk)

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

6 years agoNormalize STATUS history, full month names for non-english readers, 80 columns.
William A. Rowe Jr [Fri, 20 Apr 2018 18:02:20 +0000 (18:02 +0000)]
Normalize STATUS history, full month names for non-english readers, 80 columns.

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

6 years agovote
Jim Riggs [Fri, 20 Apr 2018 16:14:24 +0000 (16:14 +0000)]
vote

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

6 years ago+ r1829657.
Yann Ylavic [Fri, 20 Apr 2018 14:02:45 +0000 (14:02 +0000)]
+ r1829657.

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

6 years agoAdd r1829645 to ap_rgetline() proposal, resetting Eric's vote.
Yann Ylavic [Fri, 20 Apr 2018 11:19:02 +0000 (11:19 +0000)]
Add r1829645 to ap_rgetline() proposal, resetting Eric's vote.

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

6 years agoFix some formating. (extra '.', missing <code>)
Christophe Jaillet [Thu, 19 Apr 2018 20:35:21 +0000 (20:35 +0000)]
Fix some formating. (extra '.', missing <code>)

Fix the number of available load balancer scheduler algorithms and add a link to the corresponding module. (lbmethod_heartbeat was missing in the list)

(r1829613 in trunk + some formating (trailing space and alignment) to synch with trunk)

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

6 years agovote
Eric Covener [Thu, 19 Apr 2018 18:38:11 +0000 (18:38 +0000)]
vote

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

6 years agoPropose.
Yann Ylavic [Thu, 19 Apr 2018 16:51:46 +0000 (16:51 +0000)]
Propose.

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

6 years ago100% guarantee no mistakes in this commit.
Joe Orton [Thu, 19 Apr 2018 08:09:10 +0000 (08:09 +0000)]
100% guarantee no mistakes in this commit.

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