]> granicus.if.org Git - apache/log
apache
7 years agompm_worker: no mutex needed at ptrans' allocator level.
Yann Ylavic [Tue, 21 Feb 2017 14:24:14 +0000 (14:24 +0000)]
mpm_worker: no mutex needed at ptrans' allocator level.
(reverts r1783808)

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

7 years agompm_motorz: no mutex needed at ptrans' allocator level.
Yann Ylavic [Tue, 21 Feb 2017 14:21:44 +0000 (14:21 +0000)]
mpm_motorz: no mutex needed at ptrans' allocator level.
(reverts r1783755 partially)

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

7 years agoMPMs unix: Place signals handlers and helpers out of DSOs to avoid
Yann Ylavic [Tue, 21 Feb 2017 09:07:42 +0000 (09:07 +0000)]
MPMs unix: Place signals handlers and helpers out of DSOs to avoid
a possible crash if a signal is caught during (graceful) restart.
PR 60487.

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

7 years agomod_cache: Fix a regression in 2.4.25 for the forward proxy case by
Yann Ylavic [Tue, 21 Feb 2017 08:20:45 +0000 (08:20 +0000)]
mod_cache: Fix a regression in 2.4.25 for the forward proxy case by
computing and using the same entity key according to when the cache
checks, loads and saves the request.  PR 60577.

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

7 years agompm_motorz: follow up to r1783755.
Yann Ylavic [Mon, 20 Feb 2017 22:50:56 +0000 (22:50 +0000)]
mpm_motorz: follow up to r1783755.
Use an allocator and mutex for ptrans' to be safe with concurrent
creation and destruction of its subpools, like with mod_http2.

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

7 years agompm_worker: follow up to r1783755.
Yann Ylavic [Mon, 20 Feb 2017 22:49:05 +0000 (22:49 +0000)]
mpm_worker: follow up to r1783755.
Use a mutex for ptrans' allocator to be safe with concurrent
creation and destruction of its subpools, like with mod_http2.

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

7 years agompm_motorz: follow up to r1783772, with the real changes.
Yann Ylavic [Mon, 20 Feb 2017 16:55:50 +0000 (16:55 +0000)]
mpm_motorz: follow up to r1783772, with the real changes.

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

7 years agompm_motorz: each log message should use its own APLOGNO.
Yann Ylavic [Mon, 20 Feb 2017 14:17:32 +0000 (14:17 +0000)]
mpm_motorz: each log message should use its own APLOGNO.

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

7 years agowinnt/service: each log message should use its own APLOGNO.
Yann Ylavic [Mon, 20 Feb 2017 14:15:40 +0000 (14:15 +0000)]
winnt/service: each log message should use its own APLOGNO.

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

7 years agoFollow up to r1780327 and r1780329: mute update-log-tags.
Yann Ylavic [Mon, 20 Feb 2017 14:08:27 +0000 (14:08 +0000)]
Follow up to r1780327 and r1780329: mute update-log-tags.

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

7 years agoFollow up to r1772919: update APLOGNO().
Yann Ylavic [Mon, 20 Feb 2017 14:04:50 +0000 (14:04 +0000)]
Follow up to r1772919: update APLOGNO().

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

7 years agoFollow up to r1772812: update APLOGNO().
Yann Ylavic [Mon, 20 Feb 2017 14:03:28 +0000 (14:03 +0000)]
Follow up to r1772812: update APLOGNO().

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

7 years agoFollow up to r1783756: update APLOGNO.
Yann Ylavic [Mon, 20 Feb 2017 13:57:53 +0000 (13:57 +0000)]
Follow up to r1783756: update APLOGNO.

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

7 years agoFollow up to r1783755: update APLOGNO.
Yann Ylavic [Mon, 20 Feb 2017 13:56:32 +0000 (13:56 +0000)]
Follow up to r1783755: update APLOGNO.

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

7 years agoRevert r1783759: really more things than intended :p
Yann Ylavic [Mon, 20 Feb 2017 13:53:16 +0000 (13:53 +0000)]
Revert r1783759: really more things than intended :p

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

7 years agoFollow up to r1783755: update APLOGNO.
Yann Ylavic [Mon, 20 Feb 2017 13:50:49 +0000 (13:50 +0000)]
Follow up to r1783755: update APLOGNO.

[Reverted by r1783760]

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

7 years agomod_http2: use a mutex for mplx and slave connections's allocator to be safe
Yann Ylavic [Mon, 20 Feb 2017 13:41:59 +0000 (13:41 +0000)]
mod_http2: use a mutex for mplx and slave connections's allocator to be safe
with concurrent creation and destruction of their subpools.

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

7 years agompm_event: use a mutex for ptrans' allocator to be safe with concurrent
Yann Ylavic [Mon, 20 Feb 2017 13:38:03 +0000 (13:38 +0000)]
mpm_event: use a mutex for ptrans' allocator to be safe with concurrent
creation and destruction of its subpools, like with mod_http2.

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

7 years agobuild doc.
Yann Ylavic [Mon, 20 Feb 2017 08:38:58 +0000 (08:38 +0000)]
build doc.

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

7 years agoFix ProxyPassReverse schemes in mod_proxy_http2's doc (examples).
Yann Ylavic [Mon, 20 Feb 2017 08:38:16 +0000 (08:38 +0000)]
Fix ProxyPassReverse schemes in mod_proxy_http2's doc (examples).

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

7 years agoOn the trunk:
Stefan Eissing [Sun, 19 Feb 2017 21:02:26 +0000 (21:02 +0000)]
On the trunk:

mod_proxy_http2: support for ProxyPreserverHost directive.

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

7 years agoOn the trunk:
Stefan Eissing [Sun, 19 Feb 2017 19:25:48 +0000 (19:25 +0000)]
On the trunk:

mod_http2: update after backport

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

7 years agoThanks to RĂ¼diger, Yann and Jacob for catches and verification
William A. Rowe Jr [Fri, 17 Feb 2017 17:39:59 +0000 (17:39 +0000)]
Thanks to RĂ¼diger, Yann and Jacob for catches and verification

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

7 years agoRevert it part r1783317, 'avoid _free()ing NULL references.'
William A. Rowe Jr [Fri, 17 Feb 2017 17:32:26 +0000 (17:32 +0000)]
Revert it part r1783317, 'avoid _free()ing NULL references.'

OpenSSL team is committed to preserving safe _free(NULL) behaviors, and the
overhead of these calls in the context setup path is inconsequential.

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

7 years agoRevert r1783310 'Preserve OpenSSL 1.0.2 compatibility, following up on r1783305'
William A. Rowe Jr [Fri, 17 Feb 2017 17:29:51 +0000 (17:29 +0000)]
Revert r1783310 'Preserve OpenSSL 1.0.2 compatibility, following up on r1783305'

This was our first compatibility pattern but we are not preserving it, it seems
irrelevant since the death of 16 bit Windows object files.

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

7 years agoFix #cpp bug in prior commit, follow up to r1783317.
William A. Rowe Jr [Thu, 16 Feb 2017 22:30:50 +0000 (22:30 +0000)]
Fix #cpp bug in prior commit, follow up to r1783317.

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

7 years agoAvoid unnecessary code (the deprecation macro wrapper itself emits unused args
William A. Rowe Jr [Thu, 16 Feb 2017 22:27:24 +0000 (22:27 +0000)]
Avoid unnecessary code (the deprecation macro wrapper itself emits unused args
warnings) in OpenSSL 1.1.0 and avoid _free()ing NULL references.

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

7 years agoPreserve OpenSSL 1.0.2 compatibility, following up on r1783305
William A. Rowe Jr [Thu, 16 Feb 2017 21:41:55 +0000 (21:41 +0000)]
Preserve OpenSSL 1.0.2 compatibility, following up on r1783305

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

7 years agoFix OpenSSL 1.1.0 breakage in r1781575; BIO_s_file_internal() is gone.
William A. Rowe Jr [Thu, 16 Feb 2017 21:26:34 +0000 (21:26 +0000)]
Fix OpenSSL 1.1.0 breakage in r1781575; BIO_s_file_internal() is gone.

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

7 years agoSave a few bytes in the request pool.
Christophe Jaillet [Wed, 15 Feb 2017 03:52:57 +0000 (03:52 +0000)]
Save a few bytes in the request pool.

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

7 years agoSave a few bytes in the request pool.
Christophe Jaillet [Wed, 15 Feb 2017 03:48:30 +0000 (03:48 +0000)]
Save a few bytes in the request pool.

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

7 years agomod_bucketeer: consume given brigade while forwarding/setting aside.
Yann Ylavic [Tue, 14 Feb 2017 22:51:54 +0000 (22:51 +0000)]
mod_bucketeer: consume given brigade while forwarding/setting aside.

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

7 years agodefault_handler: cleanup outputed brigade before leaving.
Yann Ylavic [Tue, 14 Feb 2017 22:32:05 +0000 (22:32 +0000)]
default_handler: cleanup outputed brigade before leaving.

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

7 years agoutil_filter: better ap_pass_brigade() vs empty brigades.
Yann Ylavic [Tue, 14 Feb 2017 16:43:25 +0000 (16:43 +0000)]
util_filter: better ap_pass_brigade() vs empty brigades.

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

7 years agoOn the trunk:
Stefan Eissing [Tue, 14 Feb 2017 15:26:59 +0000 (15:26 +0000)]
On the trunk:

  *) mod_http2: not counting file buckets again stream max buffer limits.
     Effectively transfering static files in one step from slave to master
     connection. [Stefan Eissing]

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

7 years agoOn the trunk:
Stefan Eissing [Tue, 14 Feb 2017 12:54:22 +0000 (12:54 +0000)]
On the trunk:

mod_http2: aplogno tags, more unified log formatting

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

7 years agoOn the trunk:
Stefan Eissing [Tue, 14 Feb 2017 10:16:48 +0000 (10:16 +0000)]
On the trunk:

mod_http2: facilitate slave connection reuse by comforting ap_check_pipeline.

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

7 years agoOn the trunk:
Stefan Eissing [Mon, 13 Feb 2017 21:00:30 +0000 (21:00 +0000)]
On the trunk:

mod_http2: rework of stream states and cleanup handling.

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

7 years agoUpdate w/ add'n people. Jacob helped w/ the envvar stuff and Jim helped w/ the FPM...
Jim Jagielski [Mon, 13 Feb 2017 15:28:03 +0000 (15:28 +0000)]
Update w/ add'n people. Jacob helped w/ the envvar stuff and Jim helped w/ the FPM/virtual stuff
(If we remove the virtual_script stuff, remove Jim from this CHANGES entry)

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

7 years agoUpdated, fixed some missspeled words and added english changes.
Luis Gil [Sun, 12 Feb 2017 19:10:52 +0000 (19:10 +0000)]
Updated, fixed some missspeled words and added english changes.

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

7 years agoUpdated, fixed some missspeled words and added english changes.
Luis Gil [Sun, 12 Feb 2017 19:10:00 +0000 (19:10 +0000)]
Updated, fixed some missspeled words and added english changes.

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

7 years agoUpdated, fixed some missspeled words and added english changes.
Luis Gil [Sun, 12 Feb 2017 18:50:32 +0000 (18:50 +0000)]
Updated, fixed some missspeled words and added english changes.

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

7 years agodocumentation rebuild
Luca Toscano [Sat, 11 Feb 2017 16:42:37 +0000 (16:42 +0000)]
documentation rebuild

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

7 years agoRebuild.
Lucien Gentis [Sat, 11 Feb 2017 16:37:30 +0000 (16:37 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sat, 11 Feb 2017 16:36:33 +0000 (16:36 +0000)]
XML updates.

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

7 years agodocs: add more notes on ProxyFCGISetEnvIf
Jacob Champion [Fri, 10 Feb 2017 22:56:45 +0000 (22:56 +0000)]
docs: add more notes on ProxyFCGISetEnvIf

Also fix up a couple typos.

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

7 years agoProxyFCGISetEnvIf: reject invalid invocations, streamline unsets
Jacob Champion [Fri, 10 Feb 2017 21:31:13 +0000 (21:31 +0000)]
ProxyFCGISetEnvIf: reject invalid invocations, streamline unsets

Neither of the following makes sense:
- ProxyFCGISetEnvIf cond !VARIABLE value
- ProxyFCGISetEnvIf cond !

Error out in these cases. Also, don't execute the (unused) replacement
expression when unsetting.

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

7 years agoAdd syntax highlight + change separator in regex (# --> |) in order to please syntax...
Christophe Jaillet [Fri, 10 Feb 2017 19:32:06 +0000 (19:32 +0000)]
Add syntax highlight + change separator in regex (# --> |) in order to please syntax highlighting engine

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

7 years agonegation, optional parms
Eric Covener [Fri, 10 Feb 2017 15:29:33 +0000 (15:29 +0000)]
negation, optional parms

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

7 years agosupport unsetting vars
Eric Covener [Fri, 10 Feb 2017 15:25:25 +0000 (15:25 +0000)]
support unsetting vars

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

7 years agomod_proxy_fcgi: allow setting empty variables in ProxyFCGISetEnvIf
Jacob Champion [Thu, 9 Feb 2017 23:59:15 +0000 (23:59 +0000)]
mod_proxy_fcgi: allow setting empty variables in ProxyFCGISetEnvIf

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

7 years agomod_proxy_fcgi: fix spelling in APLOG_INFO message
Jacob Champion [Thu, 9 Feb 2017 23:59:14 +0000 (23:59 +0000)]
mod_proxy_fcgi: fix spelling in APLOG_INFO message

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

7 years agoAllow final admin-level fine-tuning
Jim Jagielski [Thu, 9 Feb 2017 12:58:35 +0000 (12:58 +0000)]
Allow final admin-level fine-tuning

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

7 years agodocs: update
Jacob Champion [Wed, 8 Feb 2017 20:39:39 +0000 (20:39 +0000)]
docs: update

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

7 years agodocs: fix typo in setenvif page
Jacob Champion [Wed, 8 Feb 2017 20:31:37 +0000 (20:31 +0000)]
docs: fix typo in setenvif page

As pointed out by Mark Brooks in the site comments.

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

7 years agodocs: rebuild
Jacob Champion [Wed, 8 Feb 2017 20:05:25 +0000 (20:05 +0000)]
docs: rebuild

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

7 years agotrailing whitespace
Jim Jagielski [Wed, 8 Feb 2017 14:53:06 +0000 (14:53 +0000)]
trailing whitespace

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

7 years agoRemove trailing whitespace : no functional change
Jim Jagielski [Wed, 8 Feb 2017 14:53:05 +0000 (14:53 +0000)]
Remove trailing whitespace : no functional change

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

7 years agoFollow up to r1782164: fix typo (closing double-quote).
Yann Ylavic [Wed, 8 Feb 2017 13:33:13 +0000 (13:33 +0000)]
Follow up to r1782164: fix typo (closing double-quote).

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

7 years agoLogging update
Jim Jagielski [Wed, 8 Feb 2017 13:23:36 +0000 (13:23 +0000)]
Logging update

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

7 years agodocumentation rebuild for core.xml
Luca Toscano [Wed, 8 Feb 2017 10:34:49 +0000 (10:34 +0000)]
documentation rebuild for core.xml

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

7 years agoAdd debugging info to the HttpProtocolOption directive doc
Luca Toscano [Wed, 8 Feb 2017 10:34:25 +0000 (10:34 +0000)]
Add debugging info to the HttpProtocolOption directive doc

In bugzilla and users@ we keep receiving questions about
how to test the new restrictions imposed by HttpProtocolOptions.
Added some info about how to use openssl s_client properly
and the mod_dumpio's directives to debug (thanks to
Daniel Ferradal for this suggestion).

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

7 years agocheck: merge warning fixes from feature branch
Jacob Champion [Tue, 7 Feb 2017 19:48:51 +0000 (19:48 +0000)]
check: merge warning fixes from feature branch

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

7 years agocheck: silence ServerName warnings with MPM DSOs
Jacob Champion [Tue, 7 Feb 2017 19:45:12 +0000 (19:45 +0000)]
check: silence ServerName warnings with MPM DSOs

When using shared MPMs, `httpd -V` will perform a full configuration
check, which emits warnings when there is no defined ServerName.
Unfortunately the test suite does a -V check for every test section,
spamming the output with noise.

Work around this by just uncommenting the example ServerName in the test
config.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1782066 13f79535-47bb-0310-9956-ffa450edef68

7 years agoadd a note to the vhost examples about context
Eric Covener [Mon, 6 Feb 2017 17:41:49 +0000 (17:41 +0000)]
add a note to the vhost examples about context

seems like a steady stream of comments/questions in this area.

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

7 years agoXML updates.
Lucien Gentis [Sun, 5 Feb 2017 15:39:01 +0000 (15:39 +0000)]
XML updates.

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

7 years agoChange tactic for PROXY processing in Optional case
Daniel Ruggeri [Sat, 4 Feb 2017 20:14:18 +0000 (20:14 +0000)]
Change tactic for PROXY processing in Optional case

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

7 years agoRemove unused variable
Daniel Ruggeri [Sat, 4 Feb 2017 16:51:59 +0000 (16:51 +0000)]
Remove unused variable

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

7 years agoRebuild.
Lucien Gentis [Sat, 4 Feb 2017 15:40:48 +0000 (15:40 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sat, 4 Feb 2017 15:40:07 +0000 (15:40 +0000)]
XML update.

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

7 years agoRebuild.
Lucien Gentis [Sat, 4 Feb 2017 15:24:12 +0000 (15:24 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sat, 4 Feb 2017 15:22:54 +0000 (15:22 +0000)]
XML updates.

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

7 years agoAdding .fr translation for http2 howto
Vincent Deffontaines [Sat, 4 Feb 2017 09:09:32 +0000 (09:09 +0000)]
Adding .fr translation for http2 howto

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

7 years agoAdding .fr documentation translated files. Credit to lgentis.
Vincent Deffontaines [Sat, 4 Feb 2017 08:37:30 +0000 (08:37 +0000)]
Adding .fr documentation translated files. Credit to lgentis.

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

7 years agomod_ssl: don't depend on the next output filters to cleanup the passed out
Yann Ylavic [Fri, 3 Feb 2017 17:32:32 +0000 (17:32 +0000)]
mod_ssl: don't depend on the next output filters to cleanup the passed out
brigades.

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

7 years agoDocumentation rebuild
Luca Toscano [Fri, 3 Feb 2017 17:29:37 +0000 (17:29 +0000)]
Documentation rebuild

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

7 years agoAdd missing documentation for r1781575
Jean-Frederic Clere [Fri, 3 Feb 2017 17:15:05 +0000 (17:15 +0000)]
Add missing documentation for r1781575
Fix for PR 46037

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

7 years agoAdd back the file I removed in r1781575.
Jean-Frederic Clere [Fri, 3 Feb 2017 16:52:34 +0000 (16:52 +0000)]
Add back the file I removed in r1781575.

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

7 years agoAdd Configuration for trusted OCSP responder certificates
Jean-Frederic Clere [Fri, 3 Feb 2017 16:19:17 +0000 (16:19 +0000)]
Add Configuration for trusted OCSP responder certificates
Fix for PR 46037

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

7 years agohtpasswd: report the right limit when get_password() overflows.
Yann Ylavic [Fri, 3 Feb 2017 09:11:03 +0000 (09:11 +0000)]
htpasswd: report the right limit when get_password() overflows.

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

7 years agohtpasswd: don't point to (unused) stack memory on output
Yann Ylavic [Fri, 3 Feb 2017 08:51:49 +0000 (08:51 +0000)]
htpasswd: don't point to (unused) stack memory on output
to make static analysers happy.  PR 60634.

Reported by shqking and Zhenwei Zou.

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

7 years agoadd name
Eric Covener [Wed, 1 Feb 2017 23:08:05 +0000 (23:08 +0000)]
add name

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

7 years agoadd ProxyFCGISetEnvIf
Eric Covener [Wed, 1 Feb 2017 23:07:53 +0000 (23:07 +0000)]
add ProxyFCGISetEnvIf

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

7 years agoadd no-proxy envvar for mod_proxy
Eric Covener [Wed, 1 Feb 2017 22:33:10 +0000 (22:33 +0000)]
add no-proxy envvar for mod_proxy

replacement for ProxyPass /path ! when ProxyPass is in
location context.

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

7 years agorevert r1780909 and r1773397 ProxyPass ! perdir
Eric Covener [Wed, 1 Feb 2017 22:11:49 +0000 (22:11 +0000)]
revert r1780909 and r1773397 ProxyPass ! perdir

r1773397 had a regression and the whole thing is fishy
to shoehorn the current ProxyPass ! syntax into.

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

7 years agomod_ssl: follow up to r1740928: fix memory leaks from merged proxy_ctx.
Yann Ylavic [Wed, 1 Feb 2017 21:25:26 +0000 (21:25 +0000)]
mod_ssl: follow up to r1740928: fix memory leaks from merged proxy_ctx.

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

7 years agomod_ssl: follow up to r1781187.
Yann Ylavic [Wed, 1 Feb 2017 21:23:17 +0000 (21:23 +0000)]
mod_ssl: follow up to r1781187.
Address SSL_CTX leak in (merged) proxy_ctx.

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

7 years agomod_ssl: revert r1781299 r1781188.
Yann Ylavic [Wed, 1 Feb 2017 21:17:20 +0000 (21:17 +0000)]
mod_ssl: revert r1781299 r1781188.
Need to separate follow up related to r1740928 and co from the one related to
r1781187.

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

7 years agoOn the trunk:
Stefan Eissing [Wed, 1 Feb 2017 20:40:38 +0000 (20:40 +0000)]
On the trunk:

mod_http2: fix for crash when running out of memory. Initial patch by Robert Swiecki <robert@swiecki.net>
CVEID: CVE-2017-7659

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

7 years ago* We only need this in case HAVE_SSL_CONF_CMD is defined
Ruediger Pluem [Wed, 1 Feb 2017 19:31:06 +0000 (19:31 +0000)]
* We only need this in case HAVE_SSL_CONF_CMD is defined

[Reverted by r1781311]

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

7 years agomod_ssl: follow up to r1781187.
Yann Ylavic [Wed, 1 Feb 2017 00:32:59 +0000 (00:32 +0000)]
mod_ssl: follow up to r1781187.
The ssl_util_thread_*() functions are not necessary with openssl-1.1+

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

7 years agomod_ssl: follow up to r1740928: fix memory leaks.
Yann Ylavic [Tue, 31 Jan 2017 23:39:58 +0000 (23:39 +0000)]
mod_ssl: follow up to r1740928: fix memory leaks.

[Reverted by r1781311]

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

7 years agomod_ssl: work around leaks on (graceful) restart.
Yann Ylavic [Tue, 31 Jan 2017 23:37:41 +0000 (23:37 +0000)]
mod_ssl: work around leaks on (graceful) restart.

Tested with valgrind and --with-ssl shared/static.

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

7 years agoconfigure: add dependency checks for mod_crypto
Jacob Champion [Tue, 31 Jan 2017 19:12:57 +0000 (19:12 +0000)]
configure: add dependency checks for mod_crypto

Don't enable mod_crypto in reallyall builds if we don't have a dev
version of APR-util (or APR 2).

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

7 years agomod_crypto: improve error message with older APRs
Jacob Champion [Tue, 31 Jan 2017 18:56:33 +0000 (18:56 +0000)]
mod_crypto: improve error message with older APRs

When compiling against APR < 1.6, the actual error message was buried in
unknown type errors from mod_crypto.h. Don't include that file at all if
we're going to error out anyway.

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

7 years ago* modules/metadata/mod_remoteip.c (register_hooks,
Joe Orton [Tue, 31 Jan 2017 08:39:11 +0000 (08:39 +0000)]
* modules/metadata/mod_remoteip.c (register_hooks,
  remoteip_hook_pre_connection): Reference the filter by handle rather
  than name (avoiding tree lookup by name on use).

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

7 years ago* modules/metadata/mod_remoteip.c: Fix GCC strict-aliasing warning
Joe Orton [Tue, 31 Jan 2017 08:23:38 +0000 (08:23 +0000)]
* modules/metadata/mod_remoteip.c: Fix GCC strict-aliasing warning
  by moving deference of header array via a different pointer type
  ("type-punning") out of line.

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

7 years agowishlist: add CGI fixes
Jacob Champion [Mon, 30 Jan 2017 22:39:01 +0000 (22:39 +0000)]
wishlist: add CGI fixes

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

7 years agobuildconf: merge apr-config mode from its feature branch
Jacob Champion [Mon, 30 Jan 2017 19:17:00 +0000 (19:17 +0000)]
buildconf: merge apr-config mode from its feature branch

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

7 years agoCore's documentation rebuild - part 2
Luca Toscano [Mon, 30 Jan 2017 14:59:02 +0000 (14:59 +0000)]
Core's documentation rebuild - part 2

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