VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-06 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,738 Commits 62 Branches 304 Tags
83fc00b481eb3e9d20054682ea44caeb1293c13c
Commit Graph

32738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yann Ylavic
f8ebe14b65 Propose OpenSSL 3 -Werror backport 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913834 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-16 12:06:45 +00:00
Yann Ylavic
7449adc1cb ci: Disable ASan's LeakSanitizer. 
The tool sometimes/somehow crashes in CI, though I can't reproduce locally.
Possibly an issue with the gcc toolchain used there.. disable for now as it
makes the tests fail.


Merges r1913830 from trunk (CTR).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913833 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-16 12:00:36 +00:00
Joe Orton
06c698e24f Update svn:mergeinfo to add r1614823-1614824 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913831 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-16 10:52:20 +00:00
Joe Orton
7e54229bde Update svn:mergeinfo with set of revs merged in r1787728 
from branches/2.4.x-openssl-1.1.0-compat

Revision list obtained from:

svn log --stop-on-copy ^/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat | grep ^Backport


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913829 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-16 10:11:56 +00:00
Ruediger Pluem
3abf5c8d53 * As r1913534 is now added this is a +1 [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913539 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-02 16:23:21 +00:00
Ruediger Pluem
dd42b67114 * Update proposal [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913536 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-02 15:31:39 +00:00
Yann Ylavic
8ee0e1c7d9 Vote 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913535 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-02 15:30:52 +00:00
Lucien Gentis
4f41594099 fr doc small corrections. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913500 13f79535-47bb-0310-9956-ffa450edef68
 2023-11-01 16:08:19 +00:00
Stefan Eissing
2eea90d13b Merge of /httpd/httpd/trunk:r1913466 
* mod_md: Fix the reported "until" validity of a certificate in the status
   handler. [Rainer Jung]
   Fix possible NULL deref when logging the error that an authentication
   resource could not be retrieved from the ACME server. [Stefan Eissing]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913467 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-31 10:28:22 +00:00
Ruediger Pluem
23f69bf2ea * Update proposal [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913445 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-30 16:04:09 +00:00
Ruediger Pluem
3b1973f717 * Update mergeinfo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913444 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-30 15:27:34 +00:00
Ruediger Pluem
e177c1ca0d * Update mergeinfo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913443 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-30 15:22:20 +00:00
Ruediger Pluem
cddc8c0293 Merge r1913441 from trunk: 
* Fix .gdbinit directory location

Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913442 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-30 15:03:15 +00:00
Ruediger Pluem
550c922e91 Merge r1913439 from trunk: 
* .gdbinit is one level deeper

Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913440 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-30 14:44:54 +00:00
Ruediger Pluem
65b885ed6a Merge r1913437 from trunk: 
* Systemd based systems might process core dumps via systemd-coredump.
  But we want to have local unprocessed files.

Reviewed by: ruediger


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913438 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-30 14:23:18 +00:00
Ruediger Pluem
2deffcb6b0 Merge r1910668 from trunk: 
pyhttpd: Generate core dumps on crash and show them in the ci eventually.


Reviewed by: ruediger (CI stuff is CTR)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913435 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-30 12:32:42 +00:00
Lucien Gentis
7134bd2a24 fr doc small corrections. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913389 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-27 14:07:47 +00:00
Lucien Gentis
ddfdff5741 fr doc small corrections. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913324 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-25 13:33:55 +00:00
Lucien Gentis
2f109f31e2 fr doc rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913235 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-23 15:31:07 +00:00
Lucien Gentis
3864810749 fr doc small corrections. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913234 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-23 15:30:29 +00:00
Lucien Gentis
c0c21e7a39 fr doc rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913166 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-21 09:12:03 +00:00
Lucien Gentis
44dbdbd9b4 fr doc XML file update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913165 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-21 09:10:44 +00:00
Giovanni Bechis
3f2d66af4f propose mod_ssl fixes [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913139 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-20 07:03:02 +00:00
Stefan Eissing
9d8a3a2090 publishing release httpd-2.4.58 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913112 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-19 09:27:09 +00:00
Ruediger Pluem
3917af2aed * Fully backport r1913019 and leave it to r1913023 to include it conditionally. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913027 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 13:39:41 +00:00
Stefan Eissing
86fde0f8fd Merge of /httpd/httpd/trunk:r1913023 
* modules/http2: Make WebSockets support conditional also
 on APR 1.7.x since apr_encode.h is required. Restore
 #include "apr_encode.h" removed in previous commit.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913024 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 13:21:37 +00:00
Stefan Eissing
c90c542986 * modules/http2/h2_session.c (h2_session_start): 
Restrict WebSockets options handling to with-WS builds.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913020 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 12:43:44 +00:00
Joe Orton
c110bc6cdc Merge r1913016 from trunk: [RTC exception for CI changes] 
Work around caching issue for CI builds with both apr&apr-util 
built from source.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913017 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 12:06:54 +00:00
Joe Orton
3c6caeb2dc Merge r1913007 from trunk: [RTC exception for APLOGNO] 
* modules/http2: Fill in APLOGNO.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913014 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 11:49:09 +00:00
Ruediger Pluem
7564d3b124 Merge r1912015 from trunk: 
mod_ssl: Silence info log message "SSL Library Error: error:0A000126:
         SSL routines::unexpected eof while reading" when using
         OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
         available. [Rainer Jung]

Reviewed by: rjung, gbechis, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913012 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 11:48:06 +00:00
Ruediger Pluem
eb64cfe22f Merge r1912015 from trunk: 
mod_ssl: Silence info log message "SSL Library Error: error:0A000126:
         SSL routines::unexpected eof while reading" when using
         OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
         available. [Rainer Jung]

Reviewed by: rjung, gbechis, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913010 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 11:45:19 +00:00
Ruediger Pluem
3f02e37d1a Merge r1909137, r1911067 from trunk: 
mod_alias: When an alias is declared inside a Location, make sure
the balance of the URL is preserved to match the alias declared
outside a location. Fixes an error where all requests are mapped
to the root of the location.


mod_alias: Add AliasPreservePath directive to map the full
path after the alias in a location.

Submitted by: minfrin
Reviewed by: minfrin, rpluem, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913009 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 11:42:54 +00:00
Stefan Eissing
b763f5f4e8 Merge of /httpd/httpd/trunk:r1913005 
*) mod_http2: enable WebSockets only when compiling against a
     recent enought nghttp2 version.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913006 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 11:11:45 +00:00
Stefan Eissing
87cfe35b84 update CHANGES 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913001 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 09:45:45 +00:00
Stefan Eissing
decce82a70 Merge of /httpd/httpd/trunk:r1912999 
* mod_http2: improved early cleanup of streams.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913000 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 09:05:00 +00:00
Stefan Eissing
c41eb3b14a Merge 1912993 from trunk: 
*) mod_macro: use our own strncmp function



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912994 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 06:39:44 +00:00
Stefan Eissing
a9ed7fb6f7 cleanup after backport 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912992 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 06:19:16 +00:00
Stefan Eissing
582c533c17 Merge of 1912385 from trunk: 
*) mod_http2: fixed a bug in handling of stream timeouts.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912991 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 06:18:54 +00:00
Stefan Eissing
6c78425d9e cleanup after backport 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912990 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 06:11:43 +00:00
Stefan Eissing
952cc27cad Merge of 1912415 from trunk: 
mod_http2: fixed a compile time issue on Windows builds.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912989 13f79535-47bb-0310-9956-ffa450edef68
 2023-10-16 06:11:19 +00:00
Jean-Frederic Clere
302e9775dc propose backport of r1912245. [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912602 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-29 09:10:15 +00:00
Ruediger Pluem
fdda1cb412 * Vote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912420 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-20 06:35:06 +00:00
Stefan Eissing
886d2fcb1d propose backport of r1912415 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912416 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-19 19:31:41 +00:00
Ruediger Pluem
16255aa9fc * Vote and promote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912412 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-19 09:54:49 +00:00
Stefan Eissing
6748759902 propose 1912385 for back port 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912386 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-18 08:08:30 +00:00
Lucien Gentis
c30cf8aa7b fr doc rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912217 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-09 15:19:30 +00:00
Lucien Gentis
5b7a6b4511 fr doc XML files updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912216 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-09 15:18:08 +00:00
Lucien Gentis
5093073d0d misplaced "contextlist" tag. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912215 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-09 15:14:49 +00:00
Stefan Eissing
d7f0c6d189 Merge of /httpd/httpd/trunk:r1912180 
*) mod_proxy_http2: fix `X-Forward-Host` header to carry the correct value.
     Fixes PR66752.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912194 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-08 13:23:00 +00:00
Stefan Eissing
c18c18161b Merge of /httpd/httpd/trunk:r1911964 
*) mod_proxy_http2: improved error handling on connection errors while
     response is already underway.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912193 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-08 13:18:58 +00:00