]> granicus.if.org Git - apache/log
apache
6 years agoExplain when the surrounding double quotes arround the expr argument MUST be avoided.
Christophe Jaillet [Tue, 17 Apr 2018 19:33:27 +0000 (19:33 +0000)]
Explain when the surrounding double quotes arround the expr argument MUST be avoided.

Fix an example to add these surrounding quotes to be consistent and in line with 2.4.x

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

6 years agoGuess at fixing win32 build regression on trunk introduced by r1734656
William A. Rowe Jr [Tue, 17 Apr 2018 17:57:13 +0000 (17:57 +0000)]
Guess at fixing win32 build regression on trunk introduced by r1734656

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

6 years ago* modules/ssl/ssl_util.c (modssl_request_is_tls): Adjust
Joe Orton [Mon, 16 Apr 2018 12:36:42 +0000 (12:36 +0000)]
* modules/ssl/ssl_util.c (modssl_request_is_tls): Adjust
  to take SSLConnRec * out parameter rather than SSL *.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Use it here.
  (ssl_hook_Fixup): Adjust use.

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

6 years agoFactor out logic to determine if request is using SSL/TLS and use it
Joe Orton [Mon, 16 Apr 2018 10:14:25 +0000 (10:14 +0000)]
Factor out logic to determine if request is using SSL/TLS and use it
consistently.

* modules/ssl/ssl_util.c (modssl_request_is_tls): New function.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Fixup): Use it.

* modules/ssl/mod_ssl.c (ssl_hook_http_scheme, ssl_hook_default_port):
  Use it.

PR: 61519

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

6 years agoRebuild.
Lucien Gentis [Sat, 14 Apr 2018 14:26:29 +0000 (14:26 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Sat, 14 Apr 2018 14:14:51 +0000 (14:14 +0000)]
XML updates.

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

6 years agoDump server_rec ->addrs list in dump_server_rec.
Joe Orton [Fri, 13 Apr 2018 09:36:01 +0000 (09:36 +0000)]
Dump server_rec ->addrs list in dump_server_rec.

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

6 years agomod_xml2enc: follow up to r1829038.
Yann Ylavic [Fri, 13 Apr 2018 08:04:59 +0000 (08:04 +0000)]
mod_xml2enc: follow up to r1829038.

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

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

6 years agomod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.
Yann Ylavic [Fri, 13 Apr 2018 07:58:51 +0000 (07:58 +0000)]
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>

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

6 years ago* server/vhost.c: Remove redundant vhost_check_config hook which never
Joe Orton [Thu, 12 Apr 2018 14:47:38 +0000 (14:47 +0000)]
* server/vhost.c: Remove redundant vhost_check_config hook which never
  fails, r1053230 removed all the places where config_error was set.

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

6 years agoadd log id for r1828926
Eric Covener [Wed, 11 Apr 2018 19:18:03 +0000 (19:18 +0000)]
add log id for r1828926

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

6 years agoPR62199: add worker parameter ResponseFieldSize to mod_proxy
Eric Covener [Wed, 11 Apr 2018 19:11:52 +0000 (19:11 +0000)]
PR62199: add worker parameter ResponseFieldSize to mod_proxy

Submitted By: Hank Ibell
Committed By: covener

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

6 years agoPR62186: preserve %<m for ErrorDocument internal redirects
Eric Covener [Wed, 11 Apr 2018 18:49:05 +0000 (18:49 +0000)]
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

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

6 years agoCOMPAT BREAK: This may change the hash keys used to cache privkeys
Joe Orton [Wed, 11 Apr 2018 16:11:21 +0000 (16:11 +0000)]
COMPAT BREAK: This may change the hash keys used to cache privkeys
across a reload so don't backport this to 2.4.  Otherwise it's only
user-visible in logging output.

* modules/ssl/ssl_engine_init.c (ssl_init_Module): Derive the vhost_id
  *after* potentially setting sc->enabled to default-on, since the
  port used may change if not specified explicitly.

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

6 years ago* modules/ssl/ssl_util.c (ssl_util_vhostid): Simplify code,
Joe Orton [Wed, 11 Apr 2018 15:58:04 +0000 (15:58 +0000)]
* modules/ssl/ssl_util.c (ssl_util_vhostid): Simplify code,
  no functional change.

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

6 years ago* modules/generators/mod_info.c: Constify fixed tables and mark
Joe Orton [Wed, 11 Apr 2018 15:46:44 +0000 (15:46 +0000)]
* modules/generators/mod_info.c: Constify fixed tables and mark
  module-private global variables static. No functional change.

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

6 years agomod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare...
Jim Riggs [Wed, 11 Apr 2018 12:11:05 +0000 (12:11 +0000)]
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.

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

6 years agoOn the trunk:
Stefan Eissing [Wed, 11 Apr 2018 08:30:25 +0000 (08:30 +0000)]
On the trunk:

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

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

6 years agoUpdate prettify.js
Christophe Jaillet [Tue, 10 Apr 2018 18:29:58 +0000 (18:29 +0000)]
Update prettify.js

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

6 years agoAlign the regex with the one used in 2.4.x which gives nicer results.
Christophe Jaillet [Tue, 10 Apr 2018 18:19:56 +0000 (18:19 +0000)]
Align the regex with the one used in 2.4.x which gives nicer results.

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

6 years agoWe need to get the SSL_CTX for further processing down below.
Ruediger Pluem [Tue, 10 Apr 2018 07:09:20 +0000 (07:09 +0000)]
We need to get the SSL_CTX for further processing down below.

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

6 years ago* Fix copy and paste typo.
Ruediger Pluem [Tue, 10 Apr 2018 06:42:39 +0000 (06:42 +0000)]
* Fix copy and paste typo.

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

6 years ago* The sslconn parameter is not used.
Ruediger Pluem [Tue, 10 Apr 2018 06:40:55 +0000 (06:40 +0000)]
* The sslconn parameter is not used.

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

6 years ago* Whitespace fixes. No functional change
Ruediger Pluem [Tue, 10 Apr 2018 06:39:31 +0000 (06:39 +0000)]
* Whitespace fixes. No functional change

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

6 years agomod_logio: Add LogIOTrackTTFU and %^FU logformat
Rainer Jung [Mon, 9 Apr 2018 14:36:19 +0000 (14:36 +0000)]
mod_logio: Add LogIOTrackTTFU and %^FU logformat
to log the time difference between request start
and last request body byte read (finished upload).

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

6 years agoOn the trunk:
Stefan Eissing [Mon, 9 Apr 2018 14:13:30 +0000 (14:13 +0000)]
On the trunk:

Fix buildbot unused vars errors introduced by last checkin.

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

6 years agoOn the trunk:
Stefan Eissing [Mon, 9 Apr 2018 14:05:42 +0000 (14:05 +0000)]
On the trunk:

SSLVerifyClient support for TLSv1.3 protocol now fails similarly to TLSv1.2 in my setups. (Read: I cannot get client certs to work, but I think this change is an improvement)

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

6 years agoRebuild.
Lucien Gentis [Mon, 9 Apr 2018 12:40:50 +0000 (12:40 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Mon, 9 Apr 2018 12:40:03 +0000 (12:40 +0000)]
XML updates.

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

6 years agoOn the trunk:
Stefan Eissing [Mon, 9 Apr 2018 09:39:08 +0000 (09:39 +0000)]
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

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

6 years agomodules/md/mod_md.h is now a new public API
Rainer Jung [Mon, 9 Apr 2018 07:23:57 +0000 (07:23 +0000)]
modules/md/mod_md.h is now a new public API
also used by other modules (currently mod_ssl),
so it must be in the include path. It was
missing for cmake builds.

Note that this change does not yet enable building
mod_md itself using cmake. That part is still
missing.

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

6 years agoRebuild.
Lucien Gentis [Sun, 8 Apr 2018 16:31:28 +0000 (16:31 +0000)]
Rebuild.

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

6 years agoUpdate Spanish documentation to match EN rev 1824141
Luis Gil [Sun, 8 Apr 2018 16:30:33 +0000 (16:30 +0000)]
Update Spanish documentation to match EN rev 1824141

Added:
- Centos /fedora /RED hat Instalation doc
- Ubuntu Instalation
- English notes

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

6 years agoCompatibility and Override elements inversion.
Lucien Gentis [Sun, 8 Apr 2018 16:28:02 +0000 (16:28 +0000)]
Compatibility and Override elements inversion.

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

6 years agoXML updates.
Lucien Gentis [Sun, 8 Apr 2018 16:26:08 +0000 (16:26 +0000)]
XML updates.

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

6 years agoUpdated to EN revision 1828588
Luis Gil [Sun, 8 Apr 2018 12:55:11 +0000 (12:55 +0000)]
Updated to EN revision 1828588
changed permalink
bug report
known issues
and bugfix  translated to spanish

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

6 years agoInitial doc for the sosache_redis module.
Christophe Jaillet [Sun, 8 Apr 2018 08:36:09 +0000 (08:36 +0000)]
Initial doc for the sosache_redis module.

Corrections and improvements welcome.

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

6 years agoUse apr_pcalloc in the 'create' function. All the fields are initialized in the ...
Christophe Jaillet [Sun, 8 Apr 2018 08:31:22 +0000 (08:31 +0000)]
Use apr_pcalloc in the 'create' function. All the fields are initialized in the 'init' function, but it is It is cleaner and more future proof.

Small style correction (remove extra spaces)

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

6 years agoNew xsl file which generates ready to copy/paste strings for prettify(.min).js
Christophe Jaillet [Sat, 7 Apr 2018 16:33:02 +0000 (16:33 +0000)]
New xsl file which generates ready to copy/paste strings for prettify(.min).js

All the directives are collected in some JS arrays, so that it is easier to upgrade the list
in prettify.js when new directives are added.

'build.sh' will be updated accordingly. A new build target ('prettify') will be added to
update this list. The resulting file is: docs/manual/list_for_prettify.txt

This new file is heavily inspired from convmap.xsl.

It should be possible to go further, but this is already a first step.

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

6 years agoAdd a permalink functionality to section and diective-section in the generated doc.
Christophe Jaillet [Sat, 7 Apr 2018 08:55:11 +0000 (08:55 +0000)]
Add a permalink functionality to section and diective-section in the generated doc.
This is convenient and consistent with httpd.a.o

Getting a link to a section or a directive is already possible from the TOC, but having it available directly in-place is, IMHO, much more useful.

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

6 years agoRemove an extra '>'
Christophe Jaillet [Sat, 7 Apr 2018 05:18:01 +0000 (05:18 +0000)]
Remove an extra '>'

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

6 years ago* Add missing CHANGES entry for revisions 1822849,1822858,1822878,1822879,1822883...
Ruediger Pluem [Fri, 6 Apr 2018 08:05:20 +0000 (08:05 +0000)]
* Add missing CHANGES entry for revisions 1822849,1822858,1822878,1822879,1822883,1828485

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

6 years agoneeds mod_http2.h
Gregg Lewis Smith [Thu, 5 Apr 2018 22:40:11 +0000 (22:40 +0000)]
needs mod_http2.h

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

6 years agoAdd some compatibility note + some small syntax highlight sugar.
Christophe Jaillet [Thu, 5 Apr 2018 21:13:51 +0000 (21:13 +0000)]
Add some compatibility note + some small syntax highlight sugar.

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

6 years agomod_ssl: Fix merging of proxy SSL context outside <Proxy> sections.
Yann Ylavic [Wed, 4 Apr 2018 23:36:05 +0000 (23:36 +0000)]
mod_ssl: Fix merging of proxy SSL context outside <Proxy> sections.

Regression introduced in 2.4.30. PR 62232.

The proxy SSL_CTX was not inherited from the vhost (the only available in
2.4.29) in/for any directory context besides <Proxy>...

Mostly debugged and fixed by Rainer, thanks!

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

6 years agoFor all practical purposes, MS IE 2.0 thorough 5.0 cannot connect to any
William A. Rowe Jr [Wed, 4 Apr 2018 18:59:37 +0000 (18:59 +0000)]
For all practical purposes, MS IE 2.0 thorough 5.0 cannot connect to any
httpd 2.next deployments; therefore the user-agent string will not be
readable, and this cruft is now a no-op. MS IE 20.0 in the far far future
may try to connect, removing this cruft future-proofs us.

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

6 years agoOn the trunk:
Stefan Eissing [Tue, 3 Apr 2018 13:39:27 +0000 (13:39 +0000)]
On the trunk:

removing leftovers of SSLPolicyDefine from docs.

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

6 years agoOn the trunk:
Stefan Eissing [Tue, 3 Apr 2018 13:06:02 +0000 (13:06 +0000)]
On the trunk:

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

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

6 years agoOn the trunk:
Stefan Eissing [Tue, 3 Apr 2018 12:19:28 +0000 (12:19 +0000)]
On the trunk:

mod_ssl: proper checks for libressl 2.07/8 and its TLSv1_3 support, see PR 62236.
     [Bernard Spil <brnrd@freebsd.org>]

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

6 years agoOn the trunk:
Stefan Eissing [Tue, 3 Apr 2018 11:49:17 +0000 (11:49 +0000)]
On the trunk:

mod_ssl: guard use of TLS1_3_VERSION with proper #ifdefs

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

6 years agoOn the trunk:
Stefan Eissing [Tue, 3 Apr 2018 09:12:55 +0000 (09:12 +0000)]
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.

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

6 years agoCHANGES for r1828172
Eric Covener [Mon, 2 Apr 2018 15:25:02 +0000 (15:25 +0000)]
CHANGES for r1828172

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

6 years agoPR62229: add CGIScriptTimeout to mod_cgi
Eric Covener [Mon, 2 Apr 2018 15:22:56 +0000 (15:22 +0000)]
PR62229: add CGIScriptTimeout to mod_cgi

add CGIScriptTimeout to mod_cgi, like mod_cgid's CGIDScriptTimeout.

Not addressed: making CGIScriptTimeout name work for either module.

Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener

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

6 years agodoc rebuild
Luca Toscano [Sun, 1 Apr 2018 07:27:48 +0000 (07:27 +0000)]
doc rebuild

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

6 years agoAdd a note about prepared DBD queries to rewritemap docs.
Nick Kew [Sat, 31 Mar 2018 21:14:41 +0000 (21:14 +0000)]
Add a note about prepared DBD queries to rewritemap docs.
PR#60440 identifies this as a gotcha!

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

6 years agodocs rebuild
Luca Toscano [Fri, 30 Mar 2018 15:43:58 +0000 (15:43 +0000)]
docs rebuild

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

6 years agomod_proxy.xml: docs improvements
Luca Toscano [Fri, 30 Mar 2018 15:43:40 +0000 (15:43 +0000)]
mod_proxy.xml: docs improvements

Tried to clarify the doubts raised in PR 61225
(related also to 60458) and also split a single note
into multiple ones to improve the reader's attention span
(reading through a long block of text may cause loss
of attention to important details, as it happened to me :)

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

6 years agoxforms
Eric Covener [Fri, 30 Mar 2018 12:40:53 +0000 (12:40 +0000)]
xforms

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

6 years agobring balance to the force
Eric Covener [Fri, 30 Mar 2018 12:40:13 +0000 (12:40 +0000)]
bring balance to the force

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

6 years agoOn the trunk:
Stefan Eissing [Thu, 29 Mar 2018 14:10:12 +0000 (14:10 +0000)]
On the trunk:

mod_ssl TLSv1.3 support, removed V1_3 cipher suite directives again and added an optional protocol specifier to the SSLCipherSuite and SSLProxyCipherSuite commands.

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

6 years agoOn the trunk:
Stefan Eissing [Wed, 28 Mar 2018 15:38:51 +0000 (15:38 +0000)]
On the trunk:

mod_ssl: Added configuration directives for TLSv1.3 cipher suites (which
     are separate from previous ones) as SSL(Proxy)CipherSuiteV1_3. A great opportunity
     to find a better name.

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

6 years agoOn the trunk:
Stefan Eissing [Wed, 28 Mar 2018 11:15:18 +0000 (11:15 +0000)]
On the trunk:
mod_ssl: add support for TLSv1.3 (tested with OpenSSL v1.1.1-pre3, other libs may
     need more sugar).

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

6 years agoUse 'ap_log_rerror()' instead of 'ap_log_error()' consistently
Christophe Jaillet [Tue, 27 Mar 2018 20:17:24 +0000 (20:17 +0000)]
Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently

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

6 years agoFix a potential compiler warning about uninitialized variable.
Christophe Jaillet [Mon, 26 Mar 2018 19:58:46 +0000 (19:58 +0000)]
Fix a potential compiler warning about uninitialized variable.
PR 59821

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

6 years agorebuild
Christophe Jaillet [Mon, 26 Mar 2018 19:40:06 +0000 (19:40 +0000)]
rebuild

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

6 years agoAdd a summary and explain at which loglevel the module operates. (related to PR 59088)
Christophe Jaillet [Mon, 26 Mar 2018 19:39:23 +0000 (19:39 +0000)]
Add a summary and explain at which loglevel the module operates. (related to PR 59088)

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

6 years agoSmall tweaks
Christophe Jaillet [Mon, 26 Mar 2018 18:45:37 +0000 (18:45 +0000)]
Small tweaks

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

6 years agoOn the trunk:
Stefan Eissing [Mon, 26 Mar 2018 13:09:27 +0000 (13:09 +0000)]
On the trunk:

mod_ssl: reverting r1807709 (SSLEngine with addr:port spec) as a "seemed a good idea at the time" thing.

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

6 years agoRebuilt
Christophe Jaillet [Sun, 25 Mar 2018 12:45:20 +0000 (12:45 +0000)]
Rebuilt

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

6 years agosynch with 2.4.x doc which is clearer (for the [ms] syntax at least)
Christophe Jaillet [Sun, 25 Mar 2018 12:44:21 +0000 (12:44 +0000)]
synch with 2.4.x doc which is clearer (for the [ms] syntax at least)

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

6 years agoDocument built-in DOCUMENT_PATH_INFO and USER_NAME that have been available and undoc...
Christophe Jaillet [Sun, 25 Mar 2018 11:09:51 +0000 (11:09 +0000)]
Document built-in DOCUMENT_PATH_INFO and USER_NAME that have been available and undocumented for years (already present in the very first commit of mod_include.c in svn history in 1999!)

Tested and works like a charm.

Spotted while looking at PR 34405.

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

6 years agoCHANGES for r1827654
Eric Covener [Sat, 24 Mar 2018 20:07:54 +0000 (20:07 +0000)]
CHANGES for r1827654

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

6 years agoFix some typos reported in PR 59998
Christophe Jaillet [Sat, 24 Mar 2018 20:05:19 +0000 (20:05 +0000)]
Fix some typos reported in PR 59998
Most add already been fixed when PR 59990 had been applied on trunk.

Thx klemens

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

6 years agoRebuild.
Lucien Gentis [Sat, 24 Mar 2018 15:43:23 +0000 (15:43 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Sat, 24 Mar 2018 15:42:24 +0000 (15:42 +0000)]
XML updates.

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

6 years agocopy apr_sockaddr_is_wildcard to maintain 1.4.x support.
Eric Covener [Sat, 24 Mar 2018 14:52:31 +0000 (14:52 +0000)]
copy apr_sockaddr_is_wildcard to maintain 1.4.x support.

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

6 years agoAdd compatibility note for 'RegisterHttpMethod'
Christophe Jaillet [Fri, 23 Mar 2018 22:29:23 +0000 (22:29 +0000)]
Add compatibility note for 'RegisterHttpMethod'
(backported in 2.4.x in 1772678)

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

6 years agoFix revision of a compatibility note
Christophe Jaillet [Fri, 23 Mar 2018 22:10:21 +0000 (22:10 +0000)]
Fix revision of a compatibility note
(one should always save open documents before pushing anything...)

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

6 years agoFix an xml error not spotted by build.sh
Christophe Jaillet [Fri, 23 Mar 2018 22:05:36 +0000 (22:05 +0000)]
Fix an xml error not spotted by build.sh

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

6 years agoFollow up to r1827599: don't mention EXTENDED.
Yann Ylavic [Fri, 23 Mar 2018 22:04:05 +0000 (22:04 +0000)]
Follow up to r1827599: don't mention EXTENDED.

It does/can *not* work as expected for now.

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

6 years agoAdd compatibility note for the 3rd argument of 'RewriteMap'
Christophe Jaillet [Fri, 23 Mar 2018 22:01:08 +0000 (22:01 +0000)]
Add compatibility note for the 3rd argument of 'RewriteMap'
(backported in 2.4.x in 1811748)

Improve doc highlight

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

6 years agoPlaceholder for RegexDefaultOptions.
Christophe Jaillet [Fri, 23 Mar 2018 21:08:22 +0000 (21:08 +0000)]
Placeholder for RegexDefaultOptions.

Improvement and correction welcome.

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

6 years agoOn the trunk:
Stefan Eissing [Fri, 23 Mar 2018 12:24:29 +0000 (12:24 +0000)]
On the trunk:

mod_ssl: heavily simplified SSLPolicy. No more user defines, no propxy policies,
     just the basic "modern", "intermediate" and "old" as specified by Mozilla security.

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

6 years agoFix some easy doxygen comment.
Christophe Jaillet [Thu, 22 Mar 2018 21:30:59 +0000 (21:30 +0000)]
Fix some easy doxygen comment.

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

6 years agoFix some easy doxygen comment.
Christophe Jaillet [Thu, 22 Mar 2018 21:27:12 +0000 (21:27 +0000)]
Fix some easy doxygen comment.
Much more to do.

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

6 years agoFix some doxygen comment
Christophe Jaillet [Thu, 22 Mar 2018 21:07:02 +0000 (21:07 +0000)]
Fix some doxygen comment

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

6 years agoupdate transformation
André Malo [Wed, 21 Mar 2018 21:19:47 +0000 (21:19 +0000)]
update transformation

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

6 years agoUse 'ap_request_has_body()' instead of duplicating its implemenation.
Christophe Jaillet [Tue, 20 Mar 2018 23:05:54 +0000 (23:05 +0000)]
Use 'ap_request_has_body()' instead of duplicating its implemenation.

The logic in 'ap_request_has_body()' is:
    has_body = (!r->header_only
                && (r->kept_body
                    || apr_table_get(r->headers_in, "Transfer-Encoding")
                    || ( (cls = apr_table_get(r->headers_in, "Content-Length"))
                        && (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)
                        && (!*estr)
                        && (cl > 0) )
                    )
                );
So the test is slighly different from the original code. (but this looks fine to me)

This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.

While at it, move the test '!r->expecting_100' a few lines above because it is cheap.

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

6 years agoIgnore jansson.h's -Wunused-function for GCC too.
Yann Ylavic [Tue, 20 Mar 2018 22:46:01 +0000 (22:46 +0000)]
Ignore jansson.h's -Wunused-function for GCC too.

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

6 years ago#pragma GCC diagnostic push/pop exist in gcc >= 4.6 only.
Yann Ylavic [Tue, 20 Mar 2018 22:39:48 +0000 (22:39 +0000)]
#pragma GCC diagnostic push/pop exist in gcc >= 4.6 only.

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

6 years agomod_ldap: fix format warnings.
Yann Ylavic [Tue, 20 Mar 2018 22:30:52 +0000 (22:30 +0000)]
mod_ldap: fix format warnings.

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

6 years agocore: ap_getline_core() reads nothing for n == 0.
Yann Ylavic [Tue, 20 Mar 2018 21:40:11 +0000 (21:40 +0000)]
core: ap_getline_core() reads nothing for n == 0.

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

6 years agobackported
Eric Covener [Tue, 20 Mar 2018 21:20:53 +0000 (21:20 +0000)]
backported

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

6 years agoPR62200: EBCDIC: ap_rgetline APR_ENOSPC
Eric Covener [Tue, 20 Mar 2018 21:17:18 +0000 (21:17 +0000)]
PR62200: EBCDIC: ap_rgetline APR_ENOSPC

On EBCDIC systems, translation does not occur in ap_rgetline() if the line is
larger than the buffer size.

Submitted By: Hank Ibell
Committed By: covener

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

6 years agorebuild
Christophe Jaillet [Tue, 20 Mar 2018 20:28:28 +0000 (20:28 +0000)]
rebuild

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

6 years agoImprove highlight and fix a few typo.
Christophe Jaillet [Tue, 20 Mar 2018 20:27:40 +0000 (20:27 +0000)]
Improve highlight and fix a few typo.
Mostly some missing <var></var> and <module></module>

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

6 years agomod_remoteip: make proxy-protocol work on slave connections, e.g. in HTTP/2
Stefan Eissing [Mon, 19 Mar 2018 13:07:52 +0000 (13:07 +0000)]
mod_remoteip: make proxy-protocol work on slave connections, e.g. in HTTP/2
     requests. See also https://github.com/roadrunner2/mod-proxy-protocol/issues/6

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

6 years agomod_md: fixes error in renew window calculation that may lead to mod_md running
Stefan Eissing [Mon, 19 Mar 2018 09:35:45 +0000 (09:35 +0000)]
mod_md: fixes error in renew window calculation that may lead to mod_md running
     watchdog in a tight loop until actual renewal becomes necessary.

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

6 years agomod_md: /.well-known/acme-challenge requests that cannot be answered for hostnames
Stefan Eissing [Mon, 19 Mar 2018 09:16:00 +0000 (09:16 +0000)]
mod_md: /.well-known/acme-challenge requests that cannot be answered for hostnames
     outside the configured MDs are free to be answered by other handlers. This allows
     co-existance between mod_md and other ACME clients on the same server (implements PR62189).
     [Stefan Eissing, Arkadiusz Miskiewicz <arekm@maven.pl>]

Fixes PR62189.

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

6 years agomod_http2: use proper ARP defined for formatting apr_off_t
Stefan Eissing [Mon, 19 Mar 2018 08:42:29 +0000 (08:42 +0000)]
mod_http2: use proper ARP defined for formatting apr_off_t

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