Commit Graph

33425 Commits

Author SHA1 Message Date
8f30882b0d util_time: Follow up to r1908383: ap_recent_ctime_ex() docx about trailing NUL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908384 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14 12:24:37 +00:00
ce1f5e6a49 util_time: Note/comments about ap_recent_ctime_ex() correctness wrt trailing \0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908383 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14 12:19:34 +00:00
e5fa6ee46e core: Add formats %{z} and %{strftime-format} to ErrorLogFormat. PR 62161.
%{z} prints the timezone offset (i.e. "[+-]nnnn") and %{strftime-format} allows
any %-format handled by [apr_]strftime().

* include/util_time.h():
  Define new AP_CTIME_OPTION_GMTOFF option for ap_recent_ctime_ex().

* server/util_time.c(ap_recent_ctime_ex):
  Handle AP_CTIME_OPTION_GMTOFF to print "[+-]nnnn" timezone.

* server/log.c(log_ctime):
  If the format contains a '%' it's for strftime(), otherwise it's builtin
  with new 'z' as AP_CTIME_OPTION_GMTOFF.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908380 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14 11:11:24 +00:00
05202cecea mod_rewrite's BNEG now replaced by BNE=
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908360 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 21:22:09 +00:00
fb626cc5ba mod_rewrite: Follow up to r1908347: Use [B, BNE=...] rather than [B=...,BNEG].
Replaces BNEG with BNE= for a more flexible syntax.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908359 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 21:17:52 +00:00
54317bdf45 clarify relationship
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908353 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 17:51:39 +00:00
ed87e46194 doc BNEG, improve related
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908352 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 15:52:49 +00:00
607e722f58 unclosed
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908351 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 15:40:58 +00:00
bced8a7711 mod_rewrite: New BNEG flag to negate B=, BCTLS and B= not mutually exclusive.
* modules/mappers/mod_rewrite.c(escape_backref):
  Handle [B=...,BNEG] to encode anthing not in B=, and [B=...,BCTLS] to
  encode both controls/space characters and anything set in B=.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908347 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 13:49:13 +00:00
2fa15c2c06 Do not double encode encoded slashes
In case that AllowEncodedSlashes is set to NoDecode do not double encode
encoded slashes in the URL sent by the reverse proxy to the backend.

* include/ap_mmn.h: Document the addition of ap_proxy_canonenc_ex to the API.

* modules/proxy/mod_proxy.h: Declare ap_proxy_canonenc_ex and define flag
      values.

* modules/proxy/proxy_util.c: Implement ap_proxy_canonenc_ex by modifying
      ap_proxy_canonenc accordingly and reimplement ap_proxy_canonenc to
      use ap_proxy_canonenc_ex with the appropriate flag.

* modules/http2/mod_proxy_http2.c, modules/proxy/mod_proxy_*.c: Set the
      correct flag based on the AllowEncodedSlashes configuration and use
      ap_proxy_canonenc_ex instead of ap_proxy_canonenc.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908341 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 10:24:30 +00:00
06af1142a6 Stop dumping error_log on failure, since is is now captured
(at least in theory) as an artefact.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908340 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 09:34:53 +00:00
45e6c135b4 * Favour HUGE_STRING_LEN * 2 over 1024 * 16
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908339 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13 09:25:46 +00:00
dce0f4bc54 move B=xx example to the bottom
show example with quoted flags and a space


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908302 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11 22:40:11 +00:00
3fc1d07f3b add [BCTLS] alternative to [B] for 2.4.56 problems
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908301 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11 22:10:09 +00:00
1a4aac3d20 followup to r1908296: only for redirects
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908299 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11 21:29:11 +00:00
07b802c934 allow decoded chars when they will be escaped
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908296 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11 20:57:52 +00:00
e1d523d467 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908284 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11 16:15:57 +00:00
96f0bb04ed fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908283 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11 16:14:27 +00:00
542804c63b mod_proxy: Check the query-string for proxy-noencode too.
Follow up to r1907972 and r1908095.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908257 13f79535-47bb-0310-9956-ffa450edef68
2023-03-10 21:02:31 +00:00
ab0befdca1 iFix proxy backend connection reuse tests.
Use one curl exec with multiple URLs instead of separate
curl calls, so that we make sure we use the same
connection to the web server ending up in the same
httpd child process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908230 13f79535-47bb-0310-9956-ffa450edef68
2023-03-09 23:13:42 +00:00
dd662003f6 Support splitting mutiple outputs when using curl with
multiple URLs. E.g. provide a JSON array with the
individual JSON responses as items.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908229 13f79535-47bb-0310-9956-ffa450edef68
2023-03-09 23:02:32 +00:00
959bd49452 Make test more robust, log might have a short delay.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908228 13f79535-47bb-0310-9956-ffa450edef68
2023-03-09 22:59:20 +00:00
9239fe5213 Fix tests test_202_trailer.py::TestTrailers::test_h2_202_03b
and test_202_trailer.py::TestTrailers::test_h2_202_04 by adding
an explicit Content-Type header to the nghttp call.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908220 13f79535-47bb-0310-9956-ffa450edef68
2023-03-09 10:52:14 +00:00
2f895bbf8b * Add CHANGES entry for r1907505 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908186 13f79535-47bb-0310-9956-ffa450edef68
2023-03-08 09:55:07 +00:00
26c00bfaf2 * Fix 'warning: suggest parentheses around assignment used as truth value'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908152 13f79535-47bb-0310-9956-ffa450edef68
2023-03-07 08:07:05 +00:00
669e511654 * Add a 'be' [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908150 13f79535-47bb-0310-9956-ffa450edef68
2023-03-07 07:34:08 +00:00
e653b97abc Use ap_parse_strict_length() to parse client-supplied Content-Length
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908144 13f79535-47bb-0310-9956-ffa450edef68
2023-03-07 01:51:02 +00:00
1f89cbb0d5 Remove usuless double check of APR_FINFO_NAME neing set
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908143 13f79535-47bb-0310-9956-ffa450edef68
2023-03-07 01:28:59 +00:00
3067b17275 Add SSL_SHARED_CIPHER environment variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908132 13f79535-47bb-0310-9956-ffa450edef68
2023-03-06 17:46:04 +00:00
1061b64bb7 * modules/http2/mod_proxy_http2.c: Fix missing APLOGNO.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908116 13f79535-47bb-0310-9956-ffa450edef68
2023-03-06 09:24:44 +00:00
9282a06e55 avoid delimiting the query with a backreference
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908097 13f79535-47bb-0310-9956-ffa450edef68
2023-03-05 20:31:40 +00:00
d78a166fed don't forward invalid query strings
Submitted by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908095 13f79535-47bb-0310-9956-ffa450edef68
2023-03-05 20:27:11 +00:00
a47ee08073 *) mod_md:
- Enabling ED25519 support and certificate transparency information when
       building with libressl v3.5.0 and newer. Thanks to Giovanni Bechis.
     - MDChallengeDns01 can now be configured for individual domains.
       Thanks to Jérôme Billiras (@bilhackmac) for the initial PR.
     - Fixed a bug found by Jérôme Billiras (@bilhackmac) that caused the challenge
       teardown not being invoked as it should.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908080 13f79535-47bb-0310-9956-ffa450edef68
2023-03-05 09:59:34 +00:00
d3607972c8 *) mod_htt2: recent small improvements from the github/icing/mod_h2
- conditional use of ap_thread* to allow compilation on older versions
     - fixed checks on CONNECT requests



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908079 13f79535-47bb-0310-9956-ffa450edef68
2023-03-05 09:42:53 +00:00
d73a6e1490 Test case updates related to macOS ventura changes:
- python 3.11 deprecates the `cg` module, replacing
  url query and multipart form-data handling with new code
- adaptions to changes in openssl/curl behaviours
- all mod_tls test cases now have prefix `test_tls_` for
  easier scoping.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908060 13f79535-47bb-0310-9956-ffa450edef68
2023-03-04 13:40:38 +00:00
d7ac6428db s/to to/to/
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907993 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 19:50:12 +00:00
dffd4ae216 Add RFC4331 quotas for mod_dav_fs
Fix warnings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907989 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 16:09:50 +00:00
b75ba394e5 Add RFC4331 quotas for mod_dav_fs
Address forgotten svn add in previous commit


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907984 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 15:46:12 +00:00
6c9b8075bc Sync changes [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907983 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 15:24:08 +00:00
0df5879df8 mod_proxy_uwsgi: Stricter backend HTTP response parsing/validation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907980 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 15:10:30 +00:00
be5fb2ef25 Follow up to r1907972: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907977 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 15:03:20 +00:00
0933475904 mod_proxy_uwsgi: Honor "proxy-nocanon" and "proxy-noencode".
Just like the other proxy modules.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907976 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 14:40:38 +00:00
9e8df92f5b A server layout for NetBSD's pkgsrc default settings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907975 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 14:37:20 +00:00
063e815a3c Add RFC4331 quotas for mod_dav_fs
This is enabled by a new directive: DavQuota (Off|None|#bytes)
Off (default): feature disabled
None: no quota enforced, but used and available bytes are reported
#bytes: an numerical value in bytes as the quota to enforce



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907974 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 14:36:31 +00:00
8e229adef7 Fix NULL derefernece for anonymous users
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907973 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 14:31:20 +00:00
52930446f6 mod_proxy: Don't decode r->uri and reencode in r->filename for mapping=encoded.
Decoding was not done for mapping=servlet only (a subset), but overlooked for
mapping=encoded. To avoid double-encoding in the canon_handler hook, use a new
"proxy-noencode" (similarly to "proxy-nocanon") entry in r->notes.

* proxy/mod_proxy.c(ap_proxy_trans_match):
  Set "proxy-noencode" in r->notes for PROXYPASS_MAP_ENCODED, and return DONE
  to avoid decoding in ap_process_request_internal().

* proxy/mod_proxy_http.c, proxy/mod_proxy_ajp.c, proxy/mod_proxy_wstunnel.c,
  proxy/mod_proxy_fcgi.c, proxy/mod_proxy_ajp.c, http2/mod_proxy_http2.c:
  Don't process the url through ap_proxy_canonenc() in canon_handler if
  "proxy-noencode" is set.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907972 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 14:30:20 +00:00
4e72887d7e Also run CI for PRs against 2.4.x. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907960 13f79535-47bb-0310-9956-ffa450edef68
2023-03-02 09:56:50 +00:00
a6566feac0 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907869 13f79535-47bb-0310-9956-ffa450edef68
2023-02-25 13:55:44 +00:00
9e100b4544 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907868 13f79535-47bb-0310-9956-ffa450edef68
2023-02-25 13:54:29 +00:00
9605760cff fixups vs. early in check_authn
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1907762 13f79535-47bb-0310-9956-ffa450edef68
2023-02-19 18:59:44 +00:00