]> granicus.if.org Git - apache/log
apache
6 years agoPropose
Christophe Jaillet [Mon, 2 Jul 2018 20:11:03 +0000 (20:11 +0000)]
Propose

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

6 years agoMerge r1795834, r1828912, r1830943, r1830944, r1832991 from trunk:
Jim Jagielski [Mon, 2 Jul 2018 12:49:16 +0000 (12:49 +0000)]
Merge r1795834, r1828912, r1830943, r1830944, r1832991 from trunk:

Remove empty line.

* modules/ssl/ssl_util.c (ssl_util_vhostid): Simplify code,
  no functional change.

Save a few cycles and simlify code.

Use apr_pstrmemdup instead of apr_pstrndup when possible.
Avoid scanning the first 2 bytes when looking for the | delimiter. it is known to be "${".
Avoid comma separated statements, it is not that usual.

Save a few cycles.

Use apr_pstrmemdup instead of apr_pstrndup when possible.

* modules/proxy/mod_proxy_hcheck.c (sctx_t, hc_create_config):
  Remove unused bucket allocator created off pconf.
  Tag the subpool.

Submitted by: jailletc36, jorton, jailletc36, jailletc36, jorton
Reviewed by: jailletc36, covener, jim

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

6 years agoMerge r1834209 from trunk:
Jim Jagielski [Mon, 2 Jul 2018 12:48:17 +0000 (12:48 +0000)]
Merge r1834209 from trunk:

If several parameters are used in a AuthzProviderAlias directive, if these
parameters are not enclosed in quotation mark, only the first one is handled.
The other ones are silently ignored.

Add a message to warn about such a spurious configuration.
PR 62469

Inspired by: Hank Ibell <hwibell gmail.com>
Submitted by: jailletc36
Reviewed by: jailletc36, covener, jim

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

6 years agoMerge r1817175, r1831800 from trunk:
Jim Jagielski [Mon, 2 Jul 2018 12:31:00 +0000 (12:31 +0000)]
Merge r1817175, r1831800 from trunk:

Russian translations of errordocs.
Contributed by Alexander Gaganashvili.

Error page translations submitted for zh-cn and zh-tw, contributed
by CodeingBoy <codeingboy gmail.com>.

Note that zh-tw is not a native translation; each translation aught
be reviewed by a native reader before backporting to 2.4.x branch.

Submitted by: niq, wrowe
Reviewed by: jailletc36, covener, jim

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

6 years agopromote 3 backports
Jim Jagielski [Mon, 2 Jul 2018 12:29:56 +0000 (12:29 +0000)]
promote 3 backports

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

6 years agovotes
Jim Jagielski [Mon, 2 Jul 2018 12:29:31 +0000 (12:29 +0000)]
votes

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

6 years agoFix mix-up of previous commit (r1834775)
Christophe Jaillet [Sun, 1 Jul 2018 08:35:05 +0000 (08:35 +0000)]
Fix mix-up of previous commit (r1834775)
r1828478 was already partially backported.

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

6 years agoAdd some compatibility note + some small syntax highlight sugar.
Christophe Jaillet [Sun, 1 Jul 2018 08:23:23 +0000 (08:23 +0000)]
Add some compatibility note + some small syntax highlight sugar.
(1828478 in trunk)

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

6 years agodocumentation rebuild
Luca Toscano [Sun, 1 Jul 2018 07:36:34 +0000 (07:36 +0000)]
documentation rebuild

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

6 years agooutput-filters.xml: backport r1834466
Luca Toscano [Sun, 1 Jul 2018 07:22:33 +0000 (07:22 +0000)]
output-filters.xml: backport r1834466

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

6 years agoPropose
Christophe Jaillet [Sat, 30 Jun 2018 05:44:19 +0000 (05:44 +0000)]
Propose

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

6 years agodocumentation rebuild
Luca Toscano [Fri, 29 Jun 2018 13:42:51 +0000 (13:42 +0000)]
documentation rebuild

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

6 years agoOn the 2.4.x branch:
Stefan Eissing [Fri, 29 Jun 2018 11:53:50 +0000 (11:53 +0000)]
On the 2.4.x branch:

backport of current mod_md version and documentation.

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

6 years agoVote.
Yann Ylavic [Thu, 28 Jun 2018 20:43:50 +0000 (20:43 +0000)]
Vote.

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

6 years agopropose
Christophe Jaillet [Wed, 27 Jun 2018 21:00:38 +0000 (21:00 +0000)]
propose

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

6 years agodocumentation rebuild
Luca Toscano [Wed, 27 Jun 2018 17:55:34 +0000 (17:55 +0000)]
documentation rebuild

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

6 years agomod_proxy.xml: add vhost/server contextes for ProxySet
Luca Toscano [Wed, 27 Jun 2018 17:50:40 +0000 (17:50 +0000)]
mod_proxy.xml: add vhost/server contextes for ProxySet

While reading PR 62422 I noticed that ProxySet's available
contextes list only 'directory', that looks odd:

AP_INIT_RAW_ARGS("ProxySet", set_proxy_param, NULL, RSRC_CONF|ACCESS_CONF

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

6 years agoDone.
Joe Orton [Tue, 26 Jun 2018 12:22:08 +0000 (12:22 +0000)]
Done.

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

6 years agoMerge r1834012, r1834013 from trunk:
Joe Orton [Tue, 26 Jun 2018 12:21:47 +0000 (12:21 +0000)]
Merge r1834012, r1834013 from trunk:

Add default schema ports for websockets

Nore userland/PR change

PR: 62480
Submitted by: Lubos Uhliarik <luhliari redhat.com>
Reviewed by: jim, rpluem, covener

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

6 years agopropose
Luca Toscano [Tue, 26 Jun 2018 07:28:34 +0000 (07:28 +0000)]
propose

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

6 years agovote
Eric Covener [Mon, 25 Jun 2018 14:02:08 +0000 (14:02 +0000)]
vote

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

6 years agoCHANGES for 1834321
Eric Covener [Mon, 25 Jun 2018 13:26:20 +0000 (13:26 +0000)]
CHANGES for 1834321

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

6 years agobackported
Eric Covener [Mon, 25 Jun 2018 13:24:37 +0000 (13:24 +0000)]
backported

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

6 years agoMerge r1833827 from trunk:
Eric Covener [Mon, 25 Jun 2018 13:24:16 +0000 (13:24 +0000)]
Merge r1833827 from trunk:

add server_rec to log.c fatal startup errors

Not strictly necessary for trunk, but in 2.4.x if the main ErrorLog is
using syslog, these messages are lost.  In trunk, the low-level logging
routines reach up and find the syslog provider when no server_rec is provided
but that backport is stalled.

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

6 years agopropose _ fix
Eric Covener [Mon, 25 Jun 2018 13:22:53 +0000 (13:22 +0000)]
propose _ fix

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

6 years agopropose
Luca Toscano [Mon, 25 Jun 2018 10:00:49 +0000 (10:00 +0000)]
propose

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

6 years agopropose
Christophe Jaillet [Sun, 24 Jun 2018 20:45:15 +0000 (20:45 +0000)]
propose

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

6 years agoxforms
Christophe Jaillet [Sun, 24 Jun 2018 19:42:08 +0000 (19:42 +0000)]
xforms

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

6 years agoSynch with trunk
Christophe Jaillet [Sun, 24 Jun 2018 19:40:43 +0000 (19:40 +0000)]
Synch with trunk

(backport r1765974, r1830428, r1830439, r1834258, r1834259, r1834263)

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

6 years agoSynch (a bit) with trunk
Christophe Jaillet [Sun, 24 Jun 2018 18:41:19 +0000 (18:41 +0000)]
Synch (a bit) with trunk

Backport r1643118 + some manual tweaks regarding left-over in previous backports

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

6 years agoPropose
Christophe Jaillet [Sun, 24 Jun 2018 17:06:27 +0000 (17:06 +0000)]
Propose

I've only google translated some of the proposals, in each language, and they look great.

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

6 years agoSynch with trunk.
Christophe Jaillet [Sun, 24 Jun 2018 15:41:59 +0000 (15:41 +0000)]
Synch with trunk.

Switch #loadModule of mod_macro and mod_md to keep alphabetical order.
(Win32 specific file, so no need for RTC)

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

6 years agodocumentation rebuild
Luca Toscano [Sun, 24 Jun 2018 10:33:06 +0000 (10:33 +0000)]
documentation rebuild

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

6 years agomod_proxy.xml: follow up r1834203
Luca Toscano [Sun, 24 Jun 2018 10:32:15 +0000 (10:32 +0000)]
mod_proxy.xml: follow up r1834203

Add more precise info and warn notes about
variable interpolation.

PR: 62477

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

6 years agomod_cache: Handle case of an invalid Expires
Rainer Jung [Sun, 24 Jun 2018 10:18:38 +0000 (10:18 +0000)]
mod_cache: Handle case of an invalid Expires
header value RFC compliant like the case of an
Expires time in the past: allow to overwrite the
non-caching decision using CacheStoreExpired and
respect Cache-Control "max-age" and "s-maxage".

Backport of r1833876 from trunk.

Submitted by: rjung
Reviewed by: rjung, ylavic, rpluem

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

6 years agodocumentation rebuild
Luca Toscano [Sun, 24 Jun 2018 07:27:31 +0000 (07:27 +0000)]
documentation rebuild

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

6 years agomod_proxy.xml: clarify the usage of variable interpolation
Luca Toscano [Sun, 24 Jun 2018 07:26:03 +0000 (07:26 +0000)]
mod_proxy.xml: clarify the usage of variable interpolation

PR: 62477

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

6 years agoRebuild.
Lucien Gentis [Sat, 23 Jun 2018 13:44:41 +0000 (13:44 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Sat, 23 Jun 2018 13:43:45 +0000 (13:43 +0000)]
XML updates.

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

6 years agoReorder section to be more logical.
Christophe Jaillet [Sat, 23 Jun 2018 13:15:03 +0000 (13:15 +0000)]
Reorder section to be more logical.
Based on r1553469.

This fixes an example which contains spaces in a LDAP group name (i.e. cn=Temporary Employees,o=Airius)

I've also synch with trunk:
   -  add some " to improve syntax highlight
   - use AuthLDAPUrl in stead of AuthLDAPURL in order to have syntax highlight work

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

6 years agoBackported in r1834104.
Yann Ylavic [Fri, 22 Jun 2018 10:44:41 +0000 (10:44 +0000)]
Backported in r1834104.

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

6 years agoMerge r1829038, r1829039, r1830523 from trunk:
Yann Ylavic [Fri, 22 Jun 2018 10:44:13 +0000 (10:44 +0000)]
Merge r1829038, r1829039, r1830523 from trunk:

mod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.

All meta buckets are now aggregated (besides FLUSH) and forwarded down
the chain, and the output filter bails out on EOS.

Proposed by: Micha Lenk <micha lenk.info>

mod_xml2enc: follow up to r1829038.

If any, pass pending meta bucket down the chain before leaving.

mod_xml2enc: follow up to r1829038 and r1829039.

Use below pending_data logic for EOS bucket.
This closes #48

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

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

6 years agoBackported in r1834093.
Yann Ylavic [Fri, 22 Jun 2018 10:35:28 +0000 (10:35 +0000)]
Backported in r1834093.

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

6 years agoMerge r1827362, r1828926, r1828927, r1829557, r1829573, r1829645, r1829657 from trunk:
Yann Ylavic [Fri, 22 Jun 2018 10:04:49 +0000 (10:04 +0000)]
Merge r1827362, r1828926, r1828927, r1829557, r1829573, r1829645, r1829657 from trunk:

core: ap_getline_core() reads nothing for n == 0.

PR62199: add worker parameter ResponseFieldSize to mod_proxy

Submitted By: Hank Ibell
Committed By: covener

add log id for r1828926

core: Add and handle AP_GETLINE_NOSPC_EOL flag in ap_rgetline_core().

This tells the ap_getline() family of functions to consume the end of line
when the buffer is exhausted.

PR 62198.

mod_proxy_http: make use of AP_GETLINE_NOSPC_EOL in ap_proxygetline().

Fixes response header thrown away after the previous one was considered too
large and truncated.

PR 62196.

core: forward flags to recursive/folding call to ap_rgetline_core().

We still need them when folding, other than AP_GETLINE_FOLD itself of course.

mod_proxy_http: follow up to r1829573: remain EBCDIC friendly.

Keep using ap_rgetline() as before r1829573, since ap_rgetline_core() is
EBCDIC agnostic.

Submitted by: ylavic, covener, covener, ylavic, ylavic, ylavic, ylavic
Reviewed by: ylavic, covener, rpluem

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

6 years agoBackported in r1834089.
Yann Ylavic [Fri, 22 Jun 2018 09:46:18 +0000 (09:46 +0000)]
Backported in r1834089.

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

6 years agoMerge r1826995, r1827001 from trunk:
Yann Ylavic [Fri, 22 Jun 2018 09:45:39 +0000 (09:45 +0000)]
Merge r1826995, r1827001 from trunk:

Extend SSLOCSPEnable with mode 'leaf' that only checks the leaf of a
certificate chain. PR62112 [Ricardo Martin Camarero <rickyepoderi yahoo.es>]

Fixed OCSPEnable to keep accepting "off", not "none".

Submitted by: icing
Reviewedby: icing, ylavic, rpluem

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

6 years ago* Vote and promote
Ruediger Pluem [Fri, 22 Jun 2018 09:06:46 +0000 (09:06 +0000)]
* Vote and promote

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

6 years agoxforms
Christophe Jaillet [Thu, 21 Jun 2018 20:16:21 +0000 (20:16 +0000)]
xforms

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

6 years agoImprove syntax highlight and add the default value of ProxyHTMLBufSize in the descrip...
Christophe Jaillet [Thu, 21 Jun 2018 20:04:56 +0000 (20:04 +0000)]
Improve syntax highlight and add the default value of ProxyHTMLBufSize in the description of the directive.
(r1834041 in trunk)

Add a missing word to synch with trunk

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

6 years agoxforms
Jim Jagielski [Thu, 21 Jun 2018 13:37:53 +0000 (13:37 +0000)]
xforms

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

6 years agoBackport fix proposal for wstunnel
Jim Jagielski [Thu, 21 Jun 2018 13:34:37 +0000 (13:34 +0000)]
Backport fix proposal for wstunnel

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

6 years agoVote.
Yann Ylavic [Wed, 20 Jun 2018 15:28:57 +0000 (15:28 +0000)]
Vote.

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

6 years agoVote and promote.
Rainer Jung [Tue, 19 Jun 2018 22:50:31 +0000 (22:50 +0000)]
Vote and promote.

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

6 years agoPropose.
Rainer Jung [Tue, 19 Jun 2018 22:49:32 +0000 (22:49 +0000)]
Propose.

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

6 years agoMerge r1833014 from trunk:
Jim Jagielski [Tue, 19 Jun 2018 13:15:49 +0000 (13:15 +0000)]
Merge r1833014 from trunk:

* modules/http/http_request.c (ap_process_request_after_handler,
  ap_process_request): Cache and retrieve the brigade structure used
  to send EOR and FLUSH between requests in c->pool userdata, to avoid
  allocating a brigade structure per-request out of c->pool.

Submitted by: rpluem, jorton

Submitted by: jorton
Reviewed by: jorton, covener, jim

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

6 years agoMerge r1830746 from trunk:
Jim Jagielski [Tue, 19 Jun 2018 13:14:38 +0000 (13:14 +0000)]
Merge r1830746 from trunk:

mod_proxy_html: Fix variable interpolation and memory allocation failure in ProxyHTMLURLMap.

Proposed by: Ewald Dieterich <ewald mailbox.org>
Reviewed by: ylavic

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

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

6 years agopromote
Jim Jagielski [Tue, 19 Jun 2018 13:12:38 +0000 (13:12 +0000)]
promote

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

6 years agovotes
Jim Jagielski [Tue, 19 Jun 2018 13:11:42 +0000 (13:11 +0000)]
votes

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

6 years agoleave a note/reminder
Eric Covener [Tue, 19 Jun 2018 12:13:29 +0000 (12:13 +0000)]
leave a note/reminder

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

6 years agoadd easy to flub trailing .
Eric Covener [Tue, 19 Jun 2018 12:10:27 +0000 (12:10 +0000)]
add easy to flub trailing .

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

6 years agovote/add
Eric Covener [Tue, 19 Jun 2018 12:09:38 +0000 (12:09 +0000)]
vote/add

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

6 years agoClose to closing out showstopper
Daniel Ruggeri [Fri, 15 Jun 2018 13:08:23 +0000 (13:08 +0000)]
Close to closing out showstopper

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

6 years agofix a potential NULL dereference spotted by gcc 8.1.0
Daniel Ruggeri [Thu, 14 Jun 2018 21:44:06 +0000 (21:44 +0000)]
fix a potential NULL dereference spotted by gcc 8.1.0

 *) mod_ssl: fix a potential NULL dereference spotted by gcc 8.1.0
    mod_http2: silence gcc strncpy warnings which break compilation in
               maintainer mode with gcc 8.1.0
    trunk patch: http://svn.apache.org/r1831231
                 http://svn.apache.org/r1831591
                 http://svn.apache.org/r1832934
                 http://svn.apache.org/r1832937
    2.4.x patch: svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk .
    +1: ylavic, icing, jailletc36 (by inspection)

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

6 years agoAdd a missing PR reference
Christophe Jaillet [Wed, 13 Jun 2018 18:28:59 +0000 (18:28 +0000)]
Add a missing PR reference

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

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