]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
5 years agofr doc XML file update.
Lucien Gentis [Sat, 28 Mar 2020 14:28:49 +0000 (14:28 +0000)] 
fr doc XML file update.

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

5 years agoadd userdir same-origin warnings to mod_userdir
Eric Covener [Fri, 27 Mar 2020 16:48:46 +0000 (16:48 +0000)] 
add userdir same-origin warnings to mod_userdir

Submitted By: Hanno Böck <hanno hboeck.de>

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

5 years agoParentheses around AP_BUCKET_IS_EOR argument.
Yann Ylavic [Fri, 27 Mar 2020 09:15:03 +0000 (09:15 +0000)] 
Parentheses around AP_BUCKET_IS_EOR argument.

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

5 years ago* modules/ssl/ssl_private.h: Define X509_up_ref and EVP_PKEY_up_ref
Joe Orton [Thu, 26 Mar 2020 11:03:54 +0000 (11:03 +0000)] 
* modules/ssl/ssl_private.h: Define X509_up_ref and EVP_PKEY_up_ref
  for OpenSSL < 1.1.

* modules/ssl/ssl_engine_kernel.c (modssl_set_cert_info):
* modules/ssl/ssl_util_stapling.c (stapling_get_issuer):
  Use the above macros for all OpenSSL versions.

Github: closes #104

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

5 years agoDrop -v from arm64 test runs and add to allowed failures, it is still
Joe Orton [Wed, 25 Mar 2020 15:35:46 +0000 (15:35 +0000)] 
Drop -v from arm64 test runs and add to allowed failures, it is still
not as reliable as x86 builds. [skip ci]

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

5 years ago* modules/ssl/ssl_engine_vars.c (ssl_get_tls_cb): Fix leak of X509
Joe Orton [Wed, 25 Mar 2020 15:13:06 +0000 (15:13 +0000)] 
* modules/ssl/ssl_engine_vars.c (ssl_get_tls_cb): Fix leak of X509
  struct when accessing SERVER_TLS_SERVER_END_POINT.

PR: 64264

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

5 years agoTrivial change to trigger a Travis build.
Rainer Jung [Wed, 25 Mar 2020 14:13:55 +0000 (14:13 +0000)] 
Trivial change to trigger a Travis build.

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

5 years agorevert for now, surprising the scheme is present.
Eric Covener [Wed, 25 Mar 2020 02:01:04 +0000 (02:01 +0000)] 
revert for now, surprising the scheme is present.

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

5 years agoPR63437: don't clobber the scheme in r->uri with MergeSlashes
Eric Covener [Wed, 25 Mar 2020 01:52:48 +0000 (01:52 +0000)] 
PR63437: don't clobber the scheme in r->uri with MergeSlashes

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

5 years agowss also needs is_ssl.
Jean-Frederic Clere [Tue, 24 Mar 2020 16:20:18 +0000 (16:20 +0000)] 
wss also needs is_ssl.

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

5 years agoFix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
Rainer Jung [Mon, 23 Mar 2020 13:33:22 +0000 (13:33 +0000)] 
Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
SSL_CTX_get_min_proto_version() and
SSL_CTX_get_max_proto_version() were only introduced in
1.1.0g.

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

5 years agoBetter define conditions for skipping tests on 2.4.x or non-2.4.x.
Joe Orton [Mon, 23 Mar 2020 12:08:01 +0000 (12:08 +0000)] 
Better define conditions for skipping tests on 2.4.x or non-2.4.x.
Use YAML anchors and references to avoid copy&pasting, hopefully
the syntax remains reasonably readable.

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

5 years agosilence an "uninitialized value" warning
Giovanni Bechis [Mon, 23 Mar 2020 07:08:16 +0000 (07:08 +0000)] 
silence an "uninitialized value" warning
bz 63307

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 21 Mar 2020 14:02:56 +0000 (14:02 +0000)] 
fr doc rebuild.

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

5 years agofr doc xml file update.
Lucien Gentis [Sat, 21 Mar 2020 14:01:55 +0000 (14:01 +0000)] 
fr doc xml file update.

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

5 years agoFix the travis syntax (should have done it in a PR...).
Joe Orton [Fri, 20 Mar 2020 11:58:59 +0000 (11:58 +0000)] 
Fix the travis syntax (should have done it in a PR...).

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

5 years agoFix Travis trunk/master confusion, and make the i386 build
Joe Orton [Fri, 20 Mar 2020 11:56:58 +0000 (11:56 +0000)] 
Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.

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

5 years agoTest exclsion doesn't work since "tag !~" matches when tag is undefined.
Joe Orton [Fri, 20 Mar 2020 11:36:27 +0000 (11:36 +0000)] 
Test exclsion doesn't work since "tag !~" matches when tag is undefined.
Exclude tests from 2.4.x by explicitly matching against master.  Will
have to revisit this for 2.5.x.

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

5 years agoMatch Travis jobs for 2.4.x by tag as well as branch.
Joe Orton [Fri, 20 Mar 2020 11:13:53 +0000 (11:13 +0000)] 
Match Travis jobs for 2.4.x by tag as well as branch.
Ignore failures for s390x which is flaky in apt-get again.

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

5 years agoAdd simple test for apxs to catch regression in r1872042.
Joe Orton [Fri, 20 Mar 2020 10:52:25 +0000 (10:52 +0000)] 
Add simple test for apxs to catch regression in r1872042.

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

5 years agoadd absent /modules/http2/*.o to .gitignore
Eric Covener [Fri, 20 Mar 2020 02:41:17 +0000 (02:41 +0000)] 
add absent /modules/http2/*.o to .gitignore

gets my GH sandbox clean

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

5 years agoadd git-svn generated .gitignore
Eric Covener [Fri, 20 Mar 2020 02:40:25 +0000 (02:40 +0000)] 
add git-svn generated .gitignore

Submitted By: Renier Velazco <renier.velazco upr.edu>
Committed By: covener

Github: closes #101

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

5 years agofix apxs for non-destdir builds
Eric Covener [Thu, 19 Mar 2020 15:50:18 +0000 (15:50 +0000)] 
fix apxs for non-destdir builds

subtr(...,0, -1) chops off a character and leaves relative path.

(you will need to re-run configure)

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

5 years ago* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't send
Ruediger Pluem [Wed, 18 Mar 2020 11:31:20 +0000 (11:31 +0000)] 
* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't send
  out an OCSP response that can't be parsed.

  If the crypto/ASN library can't parse a response as 'basic OCSP'
  even if it leads with a OCSP successful status, then don't pass it
  to the client. There is nothing to say at all it isn't just garbage.
  And if other types of messages are standardized they can be added.

PR: 60182
Obtained from: https://github.com/apache/httpd/commit/e72154c75dab1cc043ea1aad36758806855efb25.diff
Submitted by: <gmoniker@gmail.com>
Reviewed by: rpluem

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

5 years ago* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't stop
Ruediger Pluem [Wed, 18 Mar 2020 11:28:40 +0000 (11:28 +0000)] 
* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't stop
  Certificate Revoked messages.

  Certificate Revoked Responder messages don't belong to 'error' class.
  When the server receives one, it MUST be passed on to the client.
  And stored for the normal period of basic responses.

  Also don't log an error each time it is retrieved from cache,
  only once when it is retrieved from the OCSP responder.

PR: 60182
Obtained from: https://github.com/apache/httpd/commit/7db9795f45fd4688ceb13ee36090e4e2becbc709.diff
Submitted by: <gmoniker@gmail.com>
Reviewed by: rpluem

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

5 years ago* CHANGES for r1875353. [skip ci]
Ruediger Pluem [Wed, 18 Mar 2020 10:58:35 +0000 (10:58 +0000)] 
* CHANGES for r1875353. [skip ci]

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

5 years ago* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Clear any
Ruediger Pluem [Wed, 18 Mar 2020 10:53:06 +0000 (10:53 +0000)] 
* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Clear any
  possible returned buckets in the brigade in the error case. As we want to
  close the connection anyway there is no sensible content we could still
  sent and hence doing the needed life time transformation of the buckets
  would be a waste.

PR: 64234

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

5 years ago* server/log.c (ap_log_pid): Use more traditional C style in httpd for
Joe Orton [Mon, 16 Mar 2020 12:19:59 +0000 (12:19 +0000)] 
* server/log.c (ap_log_pid): Use more traditional C style in httpd for
  exception-handling.  No functional change.

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

5 years ago* server/log.c (ap_log_pid): Use a temporary file, then rename once
Joe Orton [Fri, 13 Mar 2020 14:34:18 +0000 (14:34 +0000)] 
* server/log.c (ap_log_pid): Use a temporary file, then rename once
  successfully written; also add error checking.  Avoids startup
  failures if a previous httpd invocation crashed while writing the
  pidfile.

Submitted by: Nicolas Carrier <carrier.nicolas0 gmail.com>, jorton
Github: closes #100, closes #69
PR: 63140

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

5 years ago* acinclude.m4 (APACHE_CHECK_SYSTEMD): Remove redundant test.
Joe Orton [Thu, 12 Mar 2020 16:16:28 +0000 (16:16 +0000)] 
* acinclude.m4 (APACHE_CHECK_SYSTEMD): Remove redundant test.

Submitted by: Pascal Terjan <pterjan linuxfr.org>
PR: 57631

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

5 years agoshould be 2.5.x in trunk
Eric Covener [Wed, 11 Mar 2020 11:11:53 +0000 (11:11 +0000)] 
should be 2.5.x in trunk

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

5 years agofix version, spotted by freenode user a-ja [skip ci]
Giovanni Bechis [Wed, 11 Mar 2020 07:12:14 +0000 (07:12 +0000)] 
fix version, spotted by freenode user a-ja [skip ci]

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

5 years agoremove unused headers
Giovanni Bechis [Mon, 9 Mar 2020 07:16:11 +0000 (07:16 +0000)] 
remove unused headers

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 7 Mar 2020 13:53:15 +0000 (13:53 +0000)] 
fr doc rebuild.

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

5 years agofr doc XML file update.
Lucien Gentis [Sat, 7 Mar 2020 13:52:02 +0000 (13:52 +0000)] 
fr doc XML file update.

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

5 years agofr doc XML files updates.
Lucien Gentis [Sat, 7 Mar 2020 13:49:25 +0000 (13:49 +0000)] 
fr doc XML files updates.

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

5 years agotypo.
Lucien Gentis [Sat, 7 Mar 2020 13:48:58 +0000 (13:48 +0000)] 
typo.

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

5 years agomisplaced <compatibility> tag.
Lucien Gentis [Sat, 7 Mar 2020 13:42:06 +0000 (13:42 +0000)] 
misplaced <compatibility> tag.

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

5 years agoAdd compatibility notes and fix some small style issues.
Christophe Jaillet [Sat, 7 Mar 2020 07:03:17 +0000 (07:03 +0000)] 
Add compatibility notes and fix some small style issues.

A link with a RFC would be welcomed, but apparenly this is only a draft (See [1]) [skip ci]

[1]: https://tools.ietf.org/id/draft-ietf-httpbis-rfc6265bis-03.html

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

5 years agorevert r1874135
Eric Covener [Fri, 6 Mar 2020 01:20:25 +0000 (01:20 +0000)] 
revert r1874135

Since 2.5.0 was released, we shoudln't purge entries during backport like
we used to do periodically.

[skip ci]

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

5 years agoUpdate docs. The expr_string.t failure has not been seen since
Joe Orton [Wed, 4 Mar 2020 08:23:55 +0000 (08:23 +0000)] 
Update docs. The expr_string.t failure has not been seen since
the workaround was added AFAICT.  The async filter bug
is still breaking the tests regularly. [skip ci].

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

5 years ago* Use a loop instead of recursion to iterate over pool siblings
Ruediger Pluem [Tue, 3 Mar 2020 14:12:39 +0000 (14:12 +0000)] 
* Use a loop instead of recursion to iterate over pool siblings

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

5 years agoFix travis config validation warnings.
Joe Orton [Tue, 3 Mar 2020 12:17:52 +0000 (12:17 +0000)] 
Fix travis config validation warnings.

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

5 years agoSwitch to using httpd-tests git repo.
Joe Orton [Tue, 3 Mar 2020 11:33:43 +0000 (11:33 +0000)] 
Switch to using httpd-tests git repo.

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

5 years agorestore/explain new session creation
Eric Covener [Mon, 2 Mar 2020 12:03:26 +0000 (12:03 +0000)] 
restore/explain new session creation

followup to r1874673.  With the included providers for load/save this path should
not be taken.

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

5 years ago *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
Stefan Eissing [Mon, 2 Mar 2020 10:42:30 +0000 (10:42 +0000)] 
  *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
     identifier under load, see <https://github.com/icing/mod_h2/issues/195>.
     [Michael Kaufmann, Stefan Eissing]

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

5 years agoPR56040: add SessionCookieMaxAge On/Off
Eric Covener [Mon, 2 Mar 2020 00:58:36 +0000 (00:58 +0000)] 
PR56040: add SessionCookieMaxAge On/Off

Allows mod_session cookies to out as "session" cookies.

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

5 years agobubble up an error if none of the passhrases work
Eric Covener [Sun, 1 Mar 2020 22:40:03 +0000 (22:40 +0000)] 
bubble up an error if none of the passhrases work

previously, the un-decodable z->encoded would get set to NULL
but success would be returned

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

5 years agoPR56052: resolve problems with expired sessions
Eric Covener [Sun, 1 Mar 2020 22:39:11 +0000 (22:39 +0000)] 
PR56052: resolve problems with expired sessions

session_load providers cache the session_rec pointer, so hollow
them out and reuse them instead of replacing them.

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

5 years agoformatting [skip ci]
Eric Covener [Sun, 1 Mar 2020 22:25:13 +0000 (22:25 +0000)] 
formatting [skip ci]

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 29 Feb 2020 14:20:36 +0000 (14:20 +0000)] 
fr doc rebuild.

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

5 years agofr doc XML file update.
Lucien Gentis [Sat, 29 Feb 2020 14:19:32 +0000 (14:19 +0000)] 
fr doc XML file update.

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

5 years agoPR64140: Allow %{Content-Type} in health check expressions
Eric Covener [Fri, 28 Feb 2020 13:02:05 +0000 (13:02 +0000)] 
PR64140: Allow %{Content-Type} in health check expressions

Submitted By: Renier Velazco <renier.velazco upr.edu>
Commited By: covener

Github: closes #97

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

5 years agoSlighly simplify code.
Christophe Jaillet [Fri, 28 Feb 2020 06:13:50 +0000 (06:13 +0000)] 
Slighly simplify code.

No need to set to NULL or 0 fields that are apr_pcalloc'ed.
Axe 'set_cookie_enable' and use 'ap_set_flag_slot' instead.

(based on ideas taken from r1874389)

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

5 years agoRemove duplicated "CookieTracking" directive in 'command_rec'.
Christophe Jaillet [Fri, 28 Feb 2020 06:07:26 +0000 (06:07 +0000)] 
Remove duplicated "CookieTracking" directive in 'command_rec'.

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

5 years agomod_ssl: simpler "goto" logic for stapling_renew_response().
Yann Ylavic [Thu, 27 Feb 2020 13:56:39 +0000 (13:56 +0000)] 
mod_ssl: simpler "goto" logic for stapling_renew_response().

No functional change.

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

5 years agomod_ssl: Fix memory leak of OCSP stapling response.
Yann Ylavic [Thu, 27 Feb 2020 12:43:51 +0000 (12:43 +0000)] 
mod_ssl: Fix memory leak of OCSP stapling response.

The OCSP_RESPONSE is either ignored or serialized (i2d_OCSP_RESPONSE) in the
TLS response/handshake extension, so it must be freed.

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

5 years agoRevert r1874574: wrong patch.
Yann Ylavic [Thu, 27 Feb 2020 12:38:41 +0000 (12:38 +0000)] 
Revert r1874574: wrong patch.

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

5 years agomod_ssl: Fix memory leak of OCSP stapling response.
Yann Ylavic [Thu, 27 Feb 2020 12:34:03 +0000 (12:34 +0000)] 
mod_ssl: Fix memory leak of OCSP stapling response.

The OCSP_RESPONSE is either ignored or serialized (i2d_OCSP_RESPONSE) in the
TLS response/handshake extension, so it must be freed.

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

5 years ago"?:" is a GNU extension, use standard syntax
Giovanni Bechis [Thu, 27 Feb 2020 06:59:10 +0000 (06:59 +0000)] 
"?:" is a GNU extension, use standard syntax
spotted by Christophe Jaillet

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

5 years agoAvoid printing NULL strings in logs
Giovanni Bechis [Wed, 26 Feb 2020 17:47:53 +0000 (17:47 +0000)] 
Avoid printing NULL strings in logs

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

5 years agoAdd an i386 build using a multilib packages and "gcc -m32".
Joe Orton [Wed, 26 Feb 2020 09:00:43 +0000 (09:00 +0000)] 
Add an i386 build using a multilib packages and "gcc -m32".
(All other Travis builds are 64-bit arches currently)

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

5 years agofr doc rebuild.
Lucien Gentis [Tue, 25 Feb 2020 16:46:12 +0000 (16:46 +0000)] 
fr doc rebuild.

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

5 years agofr doc XML files updates.
Lucien Gentis [Tue, 25 Feb 2020 16:44:22 +0000 (16:44 +0000)] 
fr doc XML files updates.

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

5 years ago* modules/generators/cgi_common.h (cgi_handle_request): Catch
Joe Orton [Tue, 25 Feb 2020 16:34:47 +0000 (16:34 +0000)] 
* modules/generators/cgi_common.h (cgi_handle_request): Catch
  (unlikely) apr_bucket_read() failure when reading request.

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

5 years agoAdd note on using scoped literal IPv6 addresses in Listen. [skip ci]
Joe Orton [Tue, 25 Feb 2020 14:27:43 +0000 (14:27 +0000)] 
Add note on using scoped literal IPv6 addresses in Listen. [skip ci]

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

5 years ago* modules/generators/cgi_common.h (cgi_handle_request): Factor out
Joe Orton [Tue, 25 Feb 2020 12:34:00 +0000 (12:34 +0000)] 
* modules/generators/cgi_common.h (cgi_handle_request): Factor out
  near-identical common code from mod_cgid, mod_cgi.

* modules/generators/mod_cgid.c (cgid_handler),
  modules/generators/mod_cgi.c (cgi_handler):
  Adjust to use cgi_handle_request.

Github: closes #97

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

5 years ago* Another whitespace fix
Ruediger Pluem [Tue, 25 Feb 2020 08:03:50 +0000 (08:03 +0000)] 
* Another whitespace fix

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

5 years ago* Whitespace fix
Ruediger Pluem [Tue, 25 Feb 2020 08:02:23 +0000 (08:02 +0000)] 
* Whitespace fix

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

5 years agomalloc -> ap_malloc
Giovanni Bechis [Mon, 24 Feb 2020 21:19:47 +0000 (21:19 +0000)] 
malloc -> ap_malloc
bz #63967

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

5 years agoPR64172: drop severity of AH01666
Eric Covener [Sun, 23 Feb 2020 13:29:52 +0000 (13:29 +0000)] 
PR64172: drop severity of AH01666

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

5 years agoPR64077: samesite/httponly/secure flags for usertrack
Eric Covener [Sat, 22 Feb 2020 17:10:10 +0000 (17:10 +0000)] 
PR64077: samesite/httponly/secure flags for usertrack

Submitted By: Prashant Keshvani <prashant2400 gmail.com>, Eric Covener
Committed By: covener

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

6 years agoAvoid printing NULL strings in logs
Giovanni Bechis [Sat, 22 Feb 2020 00:14:49 +0000 (00:14 +0000)] 
Avoid printing NULL strings in logs

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

6 years agohandle LOCAL ver_cmd proxy headers
Giovanni Bechis [Fri, 21 Feb 2020 23:19:07 +0000 (23:19 +0000)] 
handle LOCAL ver_cmd proxy headers
bz 63893

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

6 years agomore correct explanation about certificates handling
Giovanni Bechis [Fri, 21 Feb 2020 18:57:48 +0000 (18:57 +0000)] 
more correct explanation about certificates handling

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

6 years agomod_ssl: follow up to r1861950: allow for OPENSSL_init_ssl() without autoconf.
Yann Ylavic [Fri, 21 Feb 2020 14:22:10 +0000 (14:22 +0000)] 
mod_ssl: follow up to r1861950: allow for OPENSSL_init_ssl() without autoconf.

For systems with no autoconf (eg. Windows), still check for and use
OPENSSL_init_ssl() based on OpenSSL version >= 1.1.0.

Usual LibreSSL gotcha, exclude LIBRESSL_VERSION_NUMBER from this new heuristic
since autoconf is likely available in this case.

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

6 years agomod_md: re-applying the parts of r1873985 that got overwritten by the latest github...
Stefan Eissing [Fri, 21 Feb 2020 12:05:18 +0000 (12:05 +0000)] 
mod_md: re-applying the parts of r1873985 that got overwritten by the latest github sync.

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

6 years agompm_event: avoid possible KeepAlveTimeout off by -100 ms.
Yann Ylavic [Thu, 20 Feb 2020 23:41:21 +0000 (23:41 +0000)] 
mpm_event: avoid possible KeepAlveTimeout off by -100 ms.

Use TIMEOUT_FUDGE_FACTOR to limit wakeups from queues_next_expiry, yet consider
the current/unfudged timestamp to process/cleanup the queues (once woken up).

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

6 years agofr doc XML file update.
Lucien Gentis [Thu, 20 Feb 2020 16:31:36 +0000 (16:31 +0000)] 
fr doc XML file update.

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

6 years agoAdd gcc 9 job, enable enhanced malloc debugging for pool-debug job.
Joe Orton [Thu, 20 Feb 2020 14:36:46 +0000 (14:36 +0000)] 
Add gcc 9 job, enable enhanced malloc debugging for pool-debug job.

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

6 years agoPKCS#11 URIs usable from 2.4.42 and later now. [skip ci]
Joe Orton [Thu, 20 Feb 2020 08:46:39 +0000 (08:46 +0000)] 
PKCS#11 URIs usable from 2.4.42 and later now. [skip ci]

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

6 years agoAdd Travis job which runs under UBSan ("Undefined Behaviour Sanitizer").
Joe Orton [Wed, 19 Feb 2020 11:18:21 +0000 (11:18 +0000)] 
Add Travis job which runs under UBSan ("Undefined Behaviour Sanitizer").
mod_http2 disabled for now until https://github.com/icing/mod_h2/pull/194
is merged.

Github: closes #96

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

6 years agomod_md: fixed version string by removing -git, thanks for spotting @steffenal.
Stefan Eissing [Wed, 19 Feb 2020 10:54:30 +0000 (10:54 +0000)] 
mod_md: fixed version string by removing -git, thanks for spotting @steffenal.

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

6 years agoWarn against using "nobody" for User/Group since it's bad practice.
Joe Orton [Wed, 19 Feb 2020 10:52:38 +0000 (10:52 +0000)] 
Warn against using "nobody" for User/Group since it's bad practice.
Add note on supplementary groups. [skip ci]

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

6 years ago* support/suexec.c (clean_env): Revert use of ap_calloc in
Joe Orton [Tue, 18 Feb 2020 08:27:43 +0000 (08:27 +0000)] 
* support/suexec.c (clean_env): Revert use of ap_calloc in
r1874156 which broke the build.
https://travis-ci.org/apache/httpd/builds/651858409

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

6 years agoconvert malloc(3) into ap_malloc
Giovanni Bechis [Tue, 18 Feb 2020 07:37:45 +0000 (07:37 +0000)] 
convert malloc(3) into ap_malloc
bz 64049

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

6 years agoFix spelling errors in docs found by codespell. [skip ci]
Mike Rumph [Mon, 17 Feb 2020 21:41:22 +0000 (21:41 +0000)] 
Fix spelling errors in docs found by codespell.  [skip ci]

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

6 years ago* module/dav/main/util.c (dav_check_bufsize): Don't call
Joe Orton [Mon, 17 Feb 2020 17:18:57 +0000 (17:18 +0000)] 
* module/dav/main/util.c (dav_check_bufsize): Don't call
  memcpy(,NULL,0) if the buffer is uninitialized, to avoid tripping
  UBSan.  (Unclear if this is valid for this API.)

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

6 years agoCleanup of backported entries in CHANGES.
Stefan Eissing [Mon, 17 Feb 2020 14:44:26 +0000 (14:44 +0000)] 
Cleanup of backported entries in CHANGES.

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

6 years agomod_md: adding documentation for new MDContactEmail directive.
Stefan Eissing [Mon, 17 Feb 2020 14:15:32 +0000 (14:15 +0000)] 
mod_md: adding documentation for new MDContactEmail directive.

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

6 years ago *) mod_md:
Stefan Eissing [Mon, 17 Feb 2020 14:05:03 +0000 (14:05 +0000)] 
  *) mod_md:
     - Prefer MDContactEmail directive to ServerAdmin for registration. New directive
       thanks to Timothe Litt (@tlhackque).
     - protocol check for pre-configured "tls-alpn-01" challenge has been improved. It will now
       check all matching virtual hosts for protocol support. Thanks to @mkauf.
     - Corrected a check when OCSP stapling was configured for hosts
       where the responsible MDomain is not clear, by Michal Karm Babacek (@Karm).
     - Softening the restrictions where mod_md configuration directives may appear. This should
       allow for use in <If> and <Macro> sections. If all possible variations lead to the configuration
       you wanted in the first place, is another matter.
     [Michael Kaufmann <mail michael-kaufmann.ch>, Timothe Litt (@tlhackque),
      Michal Karm Babacek (@Karm), Stefan Eissing (@icing)]

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

6 years agoBack off a little when svn export is timing out.
Joe Orton [Mon, 17 Feb 2020 11:59:28 +0000 (11:59 +0000)] 
Back off a little when svn export is timing out.

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

6 years agoDefine ap_method_mask_t (typedef for apr_uint64_t) and use for method
Joe Orton [Mon, 17 Feb 2020 10:11:56 +0000 (10:11 +0000)] 
Define ap_method_mask_t (typedef for apr_uint64_t) and use for method
bitmasks rather than apr_int64_t.  Fixes UBSan errors shifting to the
top bit of a signed integer.

* include/httpd.h: Add ap_method_mask_t, use it for AP_METHOD_BIT.
  (struct ap_method_mask_t): Likewise for method_mask field.
  (struct request_rec): Likewise for allowed field.

* include/http_config.h (struct cmd_parms): Likewise for limited field.

* include/ap_mmn.h: Bump MMN major.

* modules/*/*.c: Adjust all method masks to use ap_method_mask_t.

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

6 years ago* modules/http/http_filters.c (parse_chunk_size): Reduce by four the
Joe Orton [Mon, 17 Feb 2020 08:20:52 +0000 (08:20 +0000)] 
* modules/http/http_filters.c (parse_chunk_size): Reduce by four the
  limit to the number of bits that can be handled in a chunk size, to
  avoid undefined behaviour bitshifting a signed integer left.  Max
  chunk size on 32-bit arch is now 32MiB.  Avoids UBSan error in:

http_filters.c:227:46: runtime error: left shift of 768614336404564650 by 4 places cannot be represented in type 'long int'

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

6 years agofix build with LibreSSL 2.0.7+
Giovanni Bechis [Mon, 17 Feb 2020 07:52:55 +0000 (07:52 +0000)] 
fix build with LibreSSL 2.0.7+
bz 64047

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

6 years agoFollow up to r1873941: define AP_REG_NO_DEFAULT for raw ap_regcomp() usage.
Yann Ylavic [Sun, 16 Feb 2020 23:08:32 +0000 (23:08 +0000)] 
Follow up to r1873941: define AP_REG_NO_DEFAULT for raw ap_regcomp() usage.

This avoids having to define AP_REG_NO_* for each APR_REG_* specific option,
thus replacing AP_REG_NO_DOTALL introduced lately.

For ap_rxplus_compile() and mod_substitute where default AP_REG_DOTALL is not
suitable, let's use:
    AP_REG_NO_DEFAULT | ap_regcomp_get_default_cflags() & AP_REG_DOLLAR_ENDONLY
to keep the default AP_REG_DOLLAR_ENDONLY unless RegexDefaultOptions unsets it.

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

6 years agoFollow up to r1874055: fix typo.
Yann Ylavic [Sat, 15 Feb 2020 19:13:09 +0000 (19:13 +0000)] 
Follow up to r1874055: fix typo.

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

6 years agoRHEL and CentOS now use dnf. Call out yum as the outlier, rather than
Rich Bowen [Sat, 15 Feb 2020 14:46:17 +0000 (14:46 +0000)] 
RHEL and CentOS now use dnf. Call out yum as the outlier, rather than
the other way around.

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

6 years agoAvoid UBSan exception calling memcpy(,NULL,0) at startup.
Christophe Jaillet [Sat, 15 Feb 2020 14:22:22 +0000 (14:22 +0000)] 
Avoid UBSan exception  calling memcpy(,NULL,0) at startup.

Follow-up to r1874011 which did the same for the event MPM.

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

6 years ago* server/mpm/event/event.c (event_open_logs): Avoid UBSan exception
Joe Orton [Fri, 14 Feb 2020 10:47:36 +0000 (10:47 +0000)] 
* server/mpm/event/event.c (event_open_logs): Avoid UBSan exception
  calling memcpy(,NULL,0) at startup.  Thanks to rpluem.

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