]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Christophe Jaillet [Sat, 14 Nov 2020 07:03:28 +0000 (07:03 +0000)]
Fix 2 typo [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883410 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 10 Nov 2020 08:37:45 +0000 (08:37 +0000)]
* modules/proxy/mod_proxy_wstunnel.c (proxyws_set_aysnch_delay):
Fix typo in function name, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883245 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 9 Nov 2020 06:59:17 +0000 (06:59 +0000)]
Fix a misleading typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883219 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 8 Nov 2020 22:23:16 +0000 (22:23 +0000)]
-Werror=maybe-uninitialized issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883214 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 8 Nov 2020 18:14:58 +0000 (18:14 +0000)]
Need to tickle travis after r1883209 in Apache::Test so might as well enable -v if it fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883210 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Nov 2020 17:31:08 +0000 (17:31 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883206 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Nov 2020 17:29:59 +0000 (17:29 +0000)]
fr doc translation update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883205 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 8 Nov 2020 15:25:15 +0000 (15:25 +0000)]
PR64785: mod_allowmethods: Allow methods to be added/removed with +/- prefix
Committed By: covener
Submitted By: Marcel Montes <spiceman gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883203 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 7 Nov 2020 18:59:15 +0000 (18:59 +0000)]
Optimize 'ap_list_provider_names'.
Save some memory and potentialy avoid some useless copy .
Using 'goto' is not realy in line with httpd coding style, but the function is small and still readable IMHO.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883184 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Nov 2020 15:35:13 +0000 (15:35 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883180 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Nov 2020 15:34:11 +0000 (15:34 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883179 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 4 Nov 2020 00:32:50 +0000 (00:32 +0000)]
mpm_event: don't reset connections after lingering close timeout
While httpd is supposed to do lingering close for incoming data, it has no
control anyway over outgoing/pending data once they are handled by the
system.
So don't reset the connection after lingering close times out, otherwise the
system won't do its own lingering close to flush un-acked data.
The connection reset was introduced by r1802875 and backported to 2.4.28.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883097 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 3 Nov 2020 23:58:35 +0000 (23:58 +0000)]
mpm_event: don't kill keepalive connections on connections_above_limit().
Before r1819855 (backported to 2.4.30), mpm_event killed keepalive connections
only when workers were exhausted, while this commit set workers_were_busy for
connections_above_limit().
Restore prior to r1819855 behaviour, and since ap_queue_info_num_idlers() is
now part of connections_above_limit(), let's update workers_were_busy there
only when necessary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883096 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 2 Nov 2020 19:28:51 +0000 (19:28 +0000)]
* Do UBSan testing on Focal now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883072 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Nov 2020 12:48:42 +0000 (12:48 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883048 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Nov 2020 12:38:30 +0000 (12:38 +0000)]
Add some mod_proxy_uwsgi related tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883045 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Nov 2020 12:02:31 +0000 (12:02 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883041 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Nov 2020 12:01:28 +0000 (12:01 +0000)]
Fix a typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883040 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 31 Oct 2020 14:02:16 +0000 (14:02 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883019 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 31 Oct 2020 14:00:32 +0000 (14:00 +0000)]
fr doc - XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1883018 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 30 Oct 2020 20:06:33 +0000 (20:06 +0000)]
* Condition is not needed on Focal as the system APR (1.6) is recent enough for trunk [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882999 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 30 Oct 2020 10:28:30 +0000 (10:28 +0000)]
Document that KeepAliveTimeout still applies regardless of
how RequestReadTimeout is used (had some user confusion by this
since the behaviour changed within 2.4.x, e.g. PR 56729).
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882993 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 23 Oct 2020 06:24:55 +0000 (06:24 +0000)]
* Two first tests using Ubuntu Focal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882776 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 23 Oct 2020 06:23:03 +0000 (06:23 +0000)]
* apr_base64_encode_len already includes space for the terminating zero
and apr_base64_encode returns a zero terminated string in encoded.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882775 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 15 Oct 2020 16:04:12 +0000 (16:04 +0000)]
Disable mod_http2 and mod_ssl_ct for prefork builds, since the former
shouldn't be used under prefork and the latter isn't tested at all.
Possibly related to infrequent prefork child segfaults under pool-debug.
e.g. https://travis-ci.org/github/apache/httpd/jobs/
736044109
is a multi-threaded prefork child dying with both mod_h2 and mod_ssl_ct
threads active.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882548 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 15 Oct 2020 13:45:31 +0000 (13:45 +0000)]
*) mod_md: lowered the required minimal libcurl version from 7.50 to 7.29
as proposed by <alexander.gerasimov@codeit.pro>.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882542 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 13 Oct 2020 01:22:24 +0000 (01:22 +0000)]
added new feature line to index
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882443 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 13 Oct 2020 01:16:29 +0000 (01:16 +0000)]
Adding encrypt.html.es.utf8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882442 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 13 Oct 2020 00:39:08 +0000 (00:39 +0000)]
Style lang es update to match eng revision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882441 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 11 Oct 2020 07:50:46 +0000 (07:50 +0000)]
'md_ocsp_get_stapling_status()' should return int, not apr_status_t.
This is similar to r1876549 for another function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882399 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 9 Oct 2020 19:32:27 +0000 (19:32 +0000)]
Adjust signal handler before unblocking
* server/mpm/event/event.c: Set the new signal handler before unblocking the
signal as otherwise queued signals get delivered to the old handler
immediately when the signal is unblocked.
* server/mpm/worker/worker.c: Same thing as with event.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882370 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 14:52:44 +0000 (14:52 +0000)]
rebuild all for russian langage integration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882360 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 14:33:17 +0000 (14:33 +0000)]
doc rebuild for russian integration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882358 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 14:26:03 +0000 (14:26 +0000)]
russian doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882357 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 14:13:49 +0000 (14:13 +0000)]
russian doc - obsolete file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882355 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 14:10:49 +0000 (14:10 +0000)]
russian doc - obsolete file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882353 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 13:55:30 +0000 (13:55 +0000)]
russian doc - from KOI8-R to UTF-8, missing change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882351 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 13:43:21 +0000 (13:43 +0000)]
russian doc - adding first files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882349 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 9 Oct 2020 13:07:05 +0000 (13:07 +0000)]
russian doc - from KOI8-R to UTF-8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882347 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Oct 2020 08:59:45 +0000 (08:59 +0000)]
Fix a compilation error in maintainer mode and be consistent with 'make_autoindex_entry()'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882232 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Oct 2020 08:33:52 +0000 (08:33 +0000)]
Save a few bytes of memory in mod_autoindex
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882231 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Oct 2020 07:21:59 +0000 (07:21 +0000)]
Save a few bytes of memory when registering Mutex
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882228 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Oct 2020 13:43:06 +0000 (13:43 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882217 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Oct 2020 13:41:51 +0000 (13:41 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882216 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 3 Oct 2020 06:07:55 +0000 (06:07 +0000)]
Add a missing </tr>
PR 64754
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882210 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 2 Oct 2020 15:55:32 +0000 (15:55 +0000)]
xforms [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882200 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 2 Oct 2020 15:52:39 +0000 (15:52 +0000)]
Document that HTTPS and SSL_TLS_SNI environment variables are always defined, regardless of 'SSLOptions StdEnvVars' .
Fix some small style issues to improve syntax hightlight.
PR 64783.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882199 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 Sep 2020 12:34:09 +0000 (12:34 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882065 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 Sep 2020 12:32:39 +0000 (12:32 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882064 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 Sep 2020 09:00:35 +0000 (09:00 +0000)]
Add missing comma in some 'apr_apr_psprintf()' call if APR_HAS_THREADS is not defined
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882060 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 Sep 2020 07:52:55 +0000 (07:52 +0000)]
Add missing "const" or "static const" qualifiers in some command_rec
definitions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1882053 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 17 Sep 2020 11:31:43 +0000 (11:31 +0000)]
mod_proxy: Add support for an optional third argument to ProxyRemote*
to configure the Basic auth credentials to send to the remote proxy.
(Note that credentials are always sent w/o waiting for a challenge as
with proxy-chain-auth, and only Basic is supported - both of which are
not exactly ideal - but better than nothing.)
* modules/proxy/mod_proxy.h (struct proxy_remote): Add creds field.
* modules/proxy/mod_proxy.c (proxy_handler): Pass forward proxy
credentials via r->notes.
(add_proxy): Take credentials and base64-encode into ->creds field if
passed.
(add_proxy_noregex, add_proxy_regex): Take optional creds argument.
* modules/proxy/proxy_util.c (ap_proxy_determine_connection):
Use proxy credentials from r->notes if available.
(ap_proxy_create_hdrbrgd): Set Proxy-Authorization header from
credentials in r->notes if present.
PR: 37355
Github: closes #135
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881790 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 15 Sep 2020 09:14:39 +0000 (09:14 +0000)]
* modules/dav/fs/repos.c (dav_fs_open_stream): Add specific logs for
different modes in dav_fs_open_stream(), indicate failure because of
different file open modes. Also add the filepath in the log messages.
Github: closes #138
PR: 64413
Submitted by: Bingyu Shen <ahshenbingyu gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881736 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 15 Sep 2020 07:50:26 +0000 (07:50 +0000)]
* Update change entries via make update-changes [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881729 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 11 Sep 2020 06:17:34 +0000 (06:17 +0000)]
* Changelog for r1881620 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881635 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Thu, 10 Sep 2020 14:30:08 +0000 (14:30 +0000)]
fix headers name, spotted by Ivan Zhakov
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881624 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 10 Sep 2020 10:45:12 +0000 (10:45 +0000)]
Process early errors via a dummy HTTP/1.1 request as well
Process early errors via a dummy HTTP/1.1 request as well to ensure
that the request gets logged correctly and possible custom error
pages are considered. The previous way of directly sending a HTTP/2
answer with the HTTP status code appropriate for the error is more
efficient, but does not log the request nor sents a possible custom
error page.
* modules/http2/h2.h: Add http_status to h2_request struct and define
H2_HTTP_STATUS_UNSET.
* modules/http2/h2_request.c(h2_request_create_rec): Check if
http_status is set for the request and die with the
status code it contains if set.
* modules/http2/h2_session.c(on_header_cb): Adjust the error condition
now that we mark early errors via http_status: Only return an error
if the status is not success and http_status is not H2_HTTP_STATUS_UNSET.
* modules/http2/h2_stream.c(set_error_response): Set http_status
on the request instead of creating headers for a response and a
respective brigade.
Github: closes #137
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881620 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Wed, 9 Sep 2020 15:06:29 +0000 (15:06 +0000)]
mention 304 headers handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881593 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Wed, 9 Sep 2020 14:43:07 +0000 (14:43 +0000)]
handle headers when replying a 304 following rfc7234
as discussed in bz 61820
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881590 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 8 Sep 2020 14:08:22 +0000 (14:08 +0000)]
Further re-unification of code duplicated across mod_cgi/mod_cgid into
cgi_common.h. Functional changes:
- brings the PR 61980 fix to mod_cgid as well, and
- some mod_cgid-specific APLOGNOs are dropped in favour of the
code used in the equivalent error path in mod_cgi
... otherwise no user-visible changes (intended).
* modules/generators/cgi_common.h (log_scripterror, log_script_err): Move
here from mod_cgi.
(cgi_handle_exec): Move here, renamed from mod_cgi's handle_exec.
(cgi_optfns_retrieve): New function, split out from mod_cgi's cgi_post_config.
* modules/generators/mod_cgid.c: Adjust accordingly, update to pass
logno separately.
(register_hooks): Register cgi_optfns_retrieve.
* modules/generators/mod_cgi.c: Adjust accordingly.
(register_hooks): Register cgi_optfns_retrieve.
Github: closes #141
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881559 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 8 Sep 2020 12:39:51 +0000 (12:39 +0000)]
Found a PR lurking for the method type vs UBSan issue. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881556 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 8 Sep 2020 11:46:42 +0000 (11:46 +0000)]
Document PR 64709 fix confirmed for r1881459. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881552 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 5 Sep 2020 05:24:55 +0000 (05:24 +0000)]
Support PCRE2 compile and linkage on Windows
- Embeds the HAVE_PCRE2 define as a compiler flag rather than try to work around
.h file substitutions, because the flag is only relevant to compiling the single
server/util_pcre.c file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881478 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 5 Sep 2020 05:20:59 +0000 (05:20 +0000)]
Restore broken win32 build, include apr/std headers before httpd headers
- In httpd we override exit() to trap the true exit code (see os/win32/os.h)
- process.h was redefining exit() which picked up the macro instead of the
original exit() declaration
- Cleaner style pulls in apr, then standard C headers, and finally sets down
the httpd includes on top of these, resolving the windows build regression
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881477 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 4 Sep 2020 13:56:25 +0000 (13:56 +0000)]
* modules/generators/cgi_common.h (cgi_handle_response): Avoid trying
to read the output brigade twice in the case of a timeout.
PR: 64709
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881459 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 2 Sep 2020 20:04:47 +0000 (20:04 +0000)]
Be consistent when handling OOM situation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881400 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 2 Sep 2020 12:31:30 +0000 (12:31 +0000)]
Catch assert() failures.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881396 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 1 Sep 2020 20:27:27 +0000 (20:27 +0000)]
Fix a few warnings on 64 bits windows compilation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881379 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 30 Aug 2020 06:33:10 +0000 (06:33 +0000)]
Avoid a core dump at startup if "AllowOverride nonfatal" is used without any '=' after "nonfatal".
Note that "nonfatal=" (without anything else) or "nonfatal=foo" are still not reported as erroneous and are silently ignored.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881311 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 29 Aug 2020 20:58:11 +0000 (20:58 +0000)]
Fix a few warnings on 64 bits windows compilation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881306 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 29 Aug 2020 20:49:36 +0000 (20:49 +0000)]
Fix a few warnings on 64 bits windows compilation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881305 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 29 Aug 2020 20:44:03 +0000 (20:44 +0000)]
Fix a few warnings on 64 bits windows compilation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881304 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 29 Aug 2020 20:30:41 +0000 (20:30 +0000)]
Fix a few warnings on 64 bits windows compilation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881303 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Aug 2020 14:38:57 +0000 (14:38 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881299 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Aug 2020 14:36:27 +0000 (14:36 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881298 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Aug 2020 00:29:17 +0000 (00:29 +0000)]
samesite: fix check for 0, add "false" alternative.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1881263 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 19 Aug 2020 08:55:12 +0000 (08:55 +0000)]
xform
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880987 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 19 Aug 2020 08:41:44 +0000 (08:41 +0000)]
Add a link for the WiP "New features with Apache 2.5/2.6" page
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880986 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 19 Aug 2020 07:33:25 +0000 (07:33 +0000)]
Add new transforms. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880983 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 19 Aug 2020 07:31:23 +0000 (07:31 +0000)]
Follow up to r1880368 and r1880980:
Complete move to .en.utf8 suffixes in two steps:
1. From fresh checkout, renamed all existing files:
$ for f in *.html.en */*.html.en; do svn mv $f $f.utf8; done
2. Ran "./build.sh all" which also regenerates the typemaps.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880982 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 19 Aug 2020 07:26:18 +0000 (07:26 +0000)]
Follow up to r1880368 by adjusting en.xml to match lang-targets.xml.
Ran "./build.sh bootstrap" which regenerates style/xsl/util/designations.xml
which in turn will then be used to regenerate the typemap files.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880980 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 18 Aug 2020 09:48:08 +0000 (09:48 +0000)]
Xforms. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880959 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 18 Aug 2020 09:47:35 +0000 (09:47 +0000)]
Document limitations for private key format in
SSLProxyMachineCertificateFile and
SSLProxyMachineCertificatePath. PR 63935.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880958 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 17 Aug 2020 12:32:19 +0000 (12:32 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Move
fill_reneg_buffer() call down after r->connection->master
check.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880927 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 17 Aug 2020 11:05:44 +0000 (11:05 +0000)]
* Correctly define lua_resume for Lua <= 5.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880924 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Aug 2020 13:49:34 +0000 (13:49 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880874 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Aug 2020 13:48:26 +0000 (13:48 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880873 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 10 Aug 2020 20:12:00 +0000 (20:12 +0000)]
Remove problematic version check for OpenSSL < 1.0.2
This addresses several concerns;
- There is no valid release of OpenSSL < 1.0.2 to incorporate security fixes,
particularly on Windows, and particularly as vetted by the project.
- File structure of opensslv.h has changed in such as a way as to completely
invalidate the CMake FindOpenSSL macros, so 3.0.0 cannot be determined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880754 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Mon, 10 Aug 2020 14:45:14 +0000 (14:45 +0000)]
improve Lua 5.4 handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880743 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 9 Aug 2020 19:12:14 +0000 (19:12 +0000)]
fix quotes, simplify path, add a high port
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880724 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 9 Aug 2020 16:56:43 +0000 (16:56 +0000)]
cover overlapp scenario which is straightfoward in trunk
(as long you get it in the right order)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880719 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 7 Aug 2020 12:21:35 +0000 (12:21 +0000)]
Support building against Lua 5.4 by adjusting to the 3-arg form of
lua_resume().
* modules/lua/config.m4 (CHECK_LUA): Check for lua5.4 paths.
* modules/lua/mod_lua.c (lua_output_filter_handle,
lua_input_filter_handle): Check that exactly one item is on the
stack as indicated by lua_resume().
Submitted by: Lubos Uhliarik <luhliari redhat.com>, jorton
PR: 64591
Github: closes #130, closes #133, closes #134
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880678 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 5 Aug 2020 08:26:58 +0000 (08:26 +0000)]
Fail for more abort() errors in error_log.
Fail if a core dump is produced, and dump the backtrace if so.
(e.g. during parent or child process shutdown, core dumps will
not show up as test case failures so would not otherwise be caught)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880602 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 4 Aug 2020 10:27:11 +0000 (10:27 +0000)]
Update docs for SSLRandomSeed deprecation in r1877467. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880564 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Aug 2020 16:56:25 +0000 (16:56 +0000)]
This not a hot path in RL use case, but looks to be one during testing with the test framework.
Sso save a few cycles in this (unusual) use case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880509 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Aug 2020 11:46:50 +0000 (11:46 +0000)]
Merge 2 loops in order to save a few cycles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880501 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 1 Aug 2020 10:42:57 +0000 (10:42 +0000)]
Simplify and speed-up ssl_io_data_dump().
Instead of using a temp buffer for each byte or char written, and calling
strlen over and over again to find the place where to copy this buffer,
write directly at the correct place in the final buffer, and take advantage
of 'apr_snprintf' returning the number of bytes copied.
This looks like a hot path when running the test framework (because of TRACE7), so it could be slighly useful in this use case :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880500 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Jul 2020 01:21:25 +0000 (01:21 +0000)]
don't try to load modules from a NULL path
ap_server_root_relative() can fail if apr_filepath_merge fails,
which can happen with a "bad" drive/volume or who knows what
else on Windows. Regardless, if !fullname we are already
going to retry wih what was actually passed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880461 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 30 Jul 2020 14:39:01 +0000 (14:39 +0000)]
For non-trunk run a simpler APLOGNO() test using grep which
only catches missing arguments, but this is better than nothing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880453 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 29 Jul 2020 14:01:33 +0000 (14:01 +0000)]
Update some conditions. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1880404 13f79535 -47bb-0310-9956-
ffa450edef68