]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
3 years agoab: Allow for TLSv1.3 when the SSL library supports it.
Yann Ylavic [Tue, 24 May 2022 09:06:42 +0000 (09:06 +0000)] 
ab: Allow for TLSv1.3 when the SSL library supports it.

When TLS1_3_VERSION is defined by the SSL library, bump the maximum TLS
protocol to that and use it for "-f ALL" or "-f TLSv1.3".

This mixes proposed patches from BZ 63594 and 64699.

BZ: 63594, 64699

Merge r1900157 from trunk:

Submitted by: abhilash <abhilash1232 gmail.com>
Submitted by: xiaolongx.jiang intel.com
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901203 13f79535-47bb-0310-9956-ffa450edef68

3 years agoBackported in r1901201 [skip ci]
Yann Ylavic [Tue, 24 May 2022 09:03:58 +0000 (09:03 +0000)] 
Backported in r1901201 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901202 13f79535-47bb-0310-9956-ffa450edef68

3 years agocore: Disable TCP_NOPUSH optimization on OSX. BZ 66019.
Yann Ylavic [Tue, 24 May 2022 09:03:30 +0000 (09:03 +0000)] 
core: Disable TCP_NOPUSH optimization on OSX. BZ 66019.

OSX supports TCP_NOPUSH but does not release the data retained (in TCP stack)
when the option is unset. It seems that unsetting it before the last write
does not help either so just disable the optimization for OSX in the core
output filter to avoid uncontrollable transmission delays.

* server/core_filters.c():
  Add the sock_nopush() helper that does nothing on OSX and platforms not
  supporting TCP_NOPUSH or TCP_CORK.

* server/core_filters.c(send_brigade_nonblocking):
  Use sock_nopush() instead of apr_socket_opt_set() for APR_TCP_NOPUSH option.

Merge r1900100 from trunk.

Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901201 13f79535-47bb-0310-9956-ffa450edef68

3 years agoBackported in r1901199 [skip ci]
Yann Ylavic [Tue, 24 May 2022 09:00:51 +0000 (09:00 +0000)] 
Backported in r1901199 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901200 13f79535-47bb-0310-9956-ffa450edef68

3 years agompm_event: Fix accounting of active/total processes on ungraceful restart.
Yann Ylavic [Tue, 24 May 2022 09:00:19 +0000 (09:00 +0000)] 
mpm_event: Fix accounting of active/total processes on ungraceful restart.

Children processes terminated by ap_{reclaim,relieve}_child_processes() were
were not un-accounted for total_daemons and active_daemons, which was done in
server_main_loop() only. This led to perform_idle_server_maintenance() thinking
it was over the limit of children processes and never create new ones.

Have this accounting right in event_note_child_{started,stopped}() which is
called both at runtime and reload time.

* server/mpm/event/event.c(struct event_retained_data):
  Rename field max_daemons_limit to max_daemon_used to better describe what
  it's about and to align with AP_MPMQ_MAX_DAEMON_USED.

* server/mpm/event/event.c(event_note_child_stopped):
  Renamed from event_note_child_killed() to clarify that it's not only called
  when a child is killed (i.e. on restart) but whenever a child has stopped.

* server/mpm/event/event.c(event_note_child_stopped):
  Move decrementing {active,total}_daemons and marking child's threads as
  SERVER_DEAD from server_main_loop() so that it's done both at runtime and
  reload time. Log the current number/state of daemons at APLOG_DEBUG level
  for each child stopped.

* server/mpm/event/event.c(event_note_child_started):
  Move incrementing {active,total}_daemons from make_child() for symmetry,
  given that make_child() calls event_note_child_started(). Log the current
  number/state of daemons at APLOG_DEBUG level for each child started.

* server/mpm/event/event.c(perform_idle_server_maintenance):
  Fix possible miscounting of retained->max_daemon_used accross the multiple
  calls to perform_idle_server_maintenance() if ListenCoresBucketsRatio > 0.
  Pass an int *max_daemon_used which starts at zero and is bumped consistently
  for all the buckets, while retained->max_daemon_used is updated only after
  all the buckets have been maintained.

* server/mpm/event/event.c(perform_idle_server_maintenance):
  Use event_note_child_stopped() to handle exited children processes.

Follow up to r1899777: CHANGES entry.

mpm_event: Follow up to r1899777: Fix max_daemon_used.

Merge r1899777, r1899786, r1899812 from trunk.
Fixes: BZ 66004
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901199 13f79535-47bb-0310-9956-ffa450edef68

3 years agoBackported in r1901196 [skip ci]
Yann Ylavic [Tue, 24 May 2022 08:56:14 +0000 (08:56 +0000)] 
Backported in r1901196 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901197 13f79535-47bb-0310-9956-ffa450edef68

3 years ago*) core: make ap_escape_quotes() work correctly on strings
Yann Ylavic [Tue, 24 May 2022 08:55:16 +0000 (08:55 +0000)] 
*) core: make ap_escape_quotes() work correctly on strings
   with more than MAX_INT/2 characters, counting quotes double.
   Credit to <generalbugs@zippenhop.com> for finding this.

*) core: improved checks in ap_escape_quotes() for
   extra long strings (or resulting strings) that
   exceed ptrdiff_t ranges.

Merge r1899609, r1899905 from trunk.
Reviewed by: icing, rpluem, ylavic
Submitted by: icing, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901196 13f79535-47bb-0310-9956-ffa450edef68

3 years agoVotes, promotes, [skip ci]
Joe Orton [Mon, 23 May 2022 09:27:17 +0000 (09:27 +0000)] 
Votes, promotes, [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901158 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 23 May 2022 07:33:54 +0000 (07:33 +0000)] 
* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901148 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Propose [skip ci]
Ruediger Pluem [Mon, 23 May 2022 07:16:01 +0000 (07:16 +0000)] 
* Propose [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901147 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc rebuild.
Lucien Gentis [Sat, 21 May 2022 15:09:33 +0000 (15:09 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901104 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc XML files updates.
Lucien Gentis [Sat, 21 May 2022 15:08:32 +0000 (15:08 +0000)] 
fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901103 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1901071 from trunk:
Eric Covener [Thu, 19 May 2022 18:44:15 +0000 (18:44 +0000)] 
Merge r1901071 from trunk:

escaping doesn't actually happen by default

otherwise, we would not have [B] and two internal escape functions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901072 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSync CHANGES entries [skip ci].
Yann Ylavic [Wed, 18 May 2022 12:48:33 +0000 (12:48 +0000)] 
Sync CHANGES entries [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901036 13f79535-47bb-0310-9956-ffa450edef68

3 years agoAdd back changes-entries/mod_proxy_log_backend_port.txt
Rainer Jung [Tue, 17 May 2022 18:28:08 +0000 (18:28 +0000)] 
Add back changes-entries/mod_proxy_log_backend_port.txt
which was removed erroneously by r1901009.

It is needed to document the changes applied by
r1900957 (backport of r1900028).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901013 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1900356 from trunk:
Jim Jagielski [Tue, 17 May 2022 18:19:36 +0000 (18:19 +0000)] 
Merge r1900356 from trunk:

  *) mod_http2: remove unused and insecure code. Fixes PR66037.
     Thanks to Ronald Crane (Zippenhop LLC) for reporting this.

Submitted by: icing
Reviewed by: jailletc36, icing, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901010 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r from trunk:
Jim Jagielski [Tue, 17 May 2022 18:17:44 +0000 (18:17 +0000)] 
Merge r from trunk:

Submitted by: icing, rpluem, ylavic
Reviewed by: jim

Github: closes #317

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901009 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1900335 from trunk:
Jim Jagielski [Tue, 17 May 2022 18:14:29 +0000 (18:14 +0000)] 
Merge r1900335 from trunk:

Harden mod_session and avoid overflow in case of indecently large session
Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901008 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge from trunk:
Jim Jagielski [Tue, 17 May 2022 18:13:11 +0000 (18:13 +0000)] 
Merge from trunk:
Submitted by: jim
Reviewed by: 1900340

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901007 13f79535-47bb-0310-9956-ffa450edef68

3 years agoNote missing link [skip ci]
Yann Ylavic [Tue, 17 May 2022 16:01:10 +0000 (16:01 +0000)] 
Note missing link [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901000 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMore proposals [skip ci]
Yann Ylavic [Tue, 17 May 2022 15:56:17 +0000 (15:56 +0000)] 
More proposals [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900999 13f79535-47bb-0310-9956-ffa450edef68

3 years agoNote associated PR [skip ci]
Yann Ylavic [Tue, 17 May 2022 15:47:31 +0000 (15:47 +0000)] 
Note associated PR [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900998 13f79535-47bb-0310-9956-ffa450edef68

3 years agoPropose [skip ci]
Yann Ylavic [Tue, 17 May 2022 15:43:34 +0000 (15:43 +0000)] 
Propose [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900997 13f79535-47bb-0310-9956-ffa450edef68

3 years agoAdd missing revision in merge command [skip ci].
Yann Ylavic [Tue, 17 May 2022 15:27:39 +0000 (15:27 +0000)] 
Add missing revision in merge command [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900996 13f79535-47bb-0310-9956-ffa450edef68

3 years agoVote, promote [skip ci].
Yann Ylavic [Tue, 17 May 2022 15:26:33 +0000 (15:26 +0000)] 
Vote, promote [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900995 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge /httpd/httpd/trunk:r1899841
Stefan Eissing [Tue, 17 May 2022 13:32:43 +0000 (13:32 +0000)] 
Merge  /httpd/httpd/trunk:r1899841

mod_heartmonitor: Fix setting and comparison of IPs fields.

Setting or comparing hm_server_t and hm_slot_server_t IPs should not be base
on MAXIPSIZE since the former is potentially a smaller const char*.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900986 13f79535-47bb-0310-9956-ffa450edef68

3 years agoRemove backported entry
Rainer Jung [Mon, 16 May 2022 12:40:52 +0000 (12:40 +0000)] 
Remove backported entry

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900958 13f79535-47bb-0310-9956-ffa450edef68

3 years agomod_proxy: Add backend port to log messages to
Rainer Jung [Mon, 16 May 2022 12:39:54 +0000 (12:39 +0000)] 
mod_proxy: Add backend port to log messages to
ease identification of involved service.

Merge r1900028 from trunk.
Submitted by: rjung
Reviewed by: rjung, jim, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900957 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge /httpd/httpd/trunk:r1900875
Stefan Eissing [Mon, 16 May 2022 11:38:37 +0000 (11:38 +0000)] 
Merge /httpd/httpd/trunk:r1900875

  *) test: switch rustls-ffi to v0.9.0 which gets
     rid of the cbindgen dependency.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900952 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge /httpd/httpd/trunk:r1900852,1900887
Stefan Eissing [Mon, 16 May 2022 11:36:20 +0000 (11:36 +0000)] 
Merge  /httpd/httpd/trunk:r1900852,1900887

  *) mod_md: the `MDCertificateAuthority` directive can take more than one URL/name of
     an ACME CA. This gives a failover for renewals when several consecutive attempts
     to get a certificate failed.
     A new directive was added: `MDRetryDelay` sets the delay of retries.
     A new directive was added: `MDRetryFailover` sets the number of errored
     attempts before an alternate CA is selected for certificate renewals.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900950 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Promote [skip ci]
Ruediger Pluem [Mon, 16 May 2022 07:43:03 +0000 (07:43 +0000)] 
* Promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900941 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote and comment [skip ci]
Ruediger Pluem [Mon, 16 May 2022 07:41:15 +0000 (07:41 +0000)] 
* Vote and comment [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900940 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 16 May 2022 07:06:29 +0000 (07:06 +0000)] 
* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900939 13f79535-47bb-0310-9956-ffa450edef68

3 years agoRemove backported entry
Christophe Jaillet [Fri, 13 May 2022 17:06:09 +0000 (17:06 +0000)] 
Remove backported entry

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900864 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1898453 from trunk
Christophe Jaillet [Fri, 13 May 2022 17:05:31 +0000 (17:05 +0000)] 
Merge r1898453 from trunk

   * mod_lua: ap_lua_init_mutex() is not about thread only. It also calls
apr_global_mutex_child_init(). So I see no good reason to skip this hook
if !APR_HAS_THREADS.

Some #if APR_HAS_THREADS are also already in place in
ap_lua_init_mutex() anyway.

Submitted by: jailletc36
Reviewed by: jaillect36, ylavic, rpluem
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900863 13f79535-47bb-0310-9956-ffa450edef68

3 years ago *) test: log rustc and cbindget versions used to build rustls-ffi
Stefan Eissing [Wed, 11 May 2022 08:20:43 +0000 (08:20 +0000)] 
  *) test: log rustc and cbindget versions used to build rustls-ffi
     to speed up analysis of any problems in the future.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900805 13f79535-47bb-0310-9956-ffa450edef68

3 years ago *) test: backport the cbindgen workaround for building rustls-ffi
Stefan Eissing [Wed, 11 May 2022 08:02:02 +0000 (08:02 +0000)] 
  *) test: backport the cbindgen workaround for building rustls-ffi
     so that rustc and cbindget are in a combination that works on
     focal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900804 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1899451, r1899454, r1899562, r1899564, r1899584, r1899886 from trunk:
Jim Jagielski [Mon, 9 May 2022 18:02:07 +0000 (18:02 +0000)] 
Merge r1899451, r1899454, r1899562, r1899564, r1899584, r1899886 from trunk:

* Close the connection in case an EOC bucket was seen

* In case we see an EOC bucket and there was an error bucket before, use its
  status as status for the request. This should ensure proper status logging
  in the access log.

* We need to set r->status on each call after we noticed an EOC as
  data bucket generators like ap_die might have changed the status
  code. But we know better in this case and insist on the status
  code that we have seen in the error bucket.

* Keep track of the number of keepalives we processed on this connection.

* Report a broken backend in case reading the response line failed on the
  first request on this connection otherwise we assume we have just run
  into a keepalive race and the backend is still healthy.

* Add Changelog for r1899451, r1899454, r1899562, r1899564, r1899584

Submitted by: rpluem
Reviewed by: jim

Github: closes #314

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900755 13f79535-47bb-0310-9956-ffa450edef68

3 years agopromote
Jim Jagielski [Mon, 9 May 2022 17:57:48 +0000 (17:57 +0000)] 
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900754 13f79535-47bb-0310-9956-ffa450edef68

3 years agor1900751.
Jim Jagielski [Mon, 9 May 2022 17:55:29 +0000 (17:55 +0000)] 
r1900751.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900753 13f79535-47bb-0310-9956-ffa450edef68

3 years agopromote
Jim Jagielski [Mon, 9 May 2022 17:55:06 +0000 (17:55 +0000)] 
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900752 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1900026 from trunk:
Jim Jagielski [Mon, 9 May 2022 17:54:42 +0000 (17:54 +0000)] 
Merge r1900026 from trunk:

  *) mod_heartmonitor: Set the documented default value
     "10" for HeartbeatMaxServers instead of "0". With "0"
     no shared memory slotmem was initialized. [Rainer Jung]

Submitted by: rjung
Reviewed by: 1899841

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900751 13f79535-47bb-0310-9956-ffa450edef68

3 years agoVotes
Jim Jagielski [Mon, 9 May 2022 17:53:20 +0000 (17:53 +0000)] 
Votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900750 13f79535-47bb-0310-9956-ffa450edef68

3 years agoXforms
Jim Jagielski [Mon, 9 May 2022 17:08:33 +0000 (17:08 +0000)] 
Xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900747 13f79535-47bb-0310-9956-ffa450edef68

3 years agoFix a typo (s/virtal/virtual) and add a missing hyper-link.
Christophe Jaillet [Sun, 8 May 2022 12:28:51 +0000 (12:28 +0000)] 
Fix a typo (s/virtal/virtual) and add a missing hyper-link.

r1900689 in trunk

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900690 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc rebuild.
Lucien Gentis [Sat, 7 May 2022 14:39:09 +0000 (14:39 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900657 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc XML files updates.
Lucien Gentis [Sat, 7 May 2022 14:38:22 +0000 (14:38 +0000)] 
fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900656 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge /httpd/httpd/trunk:r1900628
Stefan Eissing [Fri, 6 May 2022 13:16:36 +0000 (13:16 +0000)] 
Merge /httpd/httpd/trunk:r1900628

  *) mod_md:  fixed a bug leading to failed transfers for OCSP
     stapling information when more than 6 certificates needed
     updates in the same run.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900629 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Propose [skip ci]
Ruediger Pluem [Fri, 6 May 2022 08:26:05 +0000 (08:26 +0000)] 
* Propose [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900620 13f79535-47bb-0310-9956-ffa450edef68

3 years agopropose backport h2 [skip ci]
Stefan Eissing [Thu, 5 May 2022 08:37:49 +0000 (08:37 +0000)] 
propose backport h2 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900579 13f79535-47bb-0310-9956-ffa450edef68

3 years agohttpd 2.4.x and above require at least APR 1.3, so this is always the case.
Christophe Jaillet [Wed, 4 May 2022 17:50:35 +0000 (17:50 +0000)] 
httpd 2.4.x and above require at least APR 1.3, so this is always the case.
Simplify the wording in the doc.

r1900557 in trunk

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900558 13f79535-47bb-0310-9956-ffa450edef68

3 years agohttpd 2.4.x and above require at least APR 1.3, so this is always the case.
Christophe Jaillet [Tue, 3 May 2022 19:58:01 +0000 (19:58 +0000)] 
httpd 2.4.x and above require at least APR 1.3, so this is always the case.
Simplify the wording in the doc.

r1900525 in trunk

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900526 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc rebuild.
Lucien Gentis [Sat, 30 Apr 2022 15:48:22 +0000 (15:48 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900428 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc XML file update.
Lucien Gentis [Sat, 30 Apr 2022 15:47:34 +0000 (15:47 +0000)] 
fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900427 13f79535-47bb-0310-9956-ffa450edef68

3 years agovote [skip ci]
Stefan Eissing [Sat, 30 Apr 2022 10:07:06 +0000 (10:07 +0000)] 
vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900423 13f79535-47bb-0310-9956-ffa450edef68

3 years agoPropose
Christophe Jaillet [Sat, 30 Apr 2022 09:41:10 +0000 (09:41 +0000)] 
Propose

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900421 13f79535-47bb-0310-9956-ffa450edef68

3 years agoVote
Christophe Jaillet [Sat, 30 Apr 2022 09:36:30 +0000 (09:36 +0000)] 
Vote

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900419 13f79535-47bb-0310-9956-ffa450edef68

3 years agoRemove proposal after backport of mod_md change, experimental mods do not need RTC.
Stefan Eissing [Thu, 28 Apr 2022 10:45:11 +0000 (10:45 +0000)] 
Remove proposal after backport of mod_md change, experimental mods do not need RTC.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900358 13f79535-47bb-0310-9956-ffa450edef68

3 years agobackport proposal for PR66037 fix.
Stefan Eissing [Thu, 28 Apr 2022 10:43:57 +0000 (10:43 +0000)] 
backport proposal for PR66037 fix.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900357 13f79535-47bb-0310-9956-ffa450edef68

3 years agoFix formatting of CHANGES entry.
Rainer Jung [Wed, 27 Apr 2022 14:30:00 +0000 (14:30 +0000)] 
Fix formatting of CHANGES entry.
CTR
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900321 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge /httpd/httpd/trunk:r1898962,1900039,1900145,1900313-1900314
Stefan Eissing [Wed, 27 Apr 2022 12:08:18 +0000 (12:08 +0000)] 
Merge /httpd/httpd/trunk:r1898962,1900039,1900145,1900313-1900314

Backport of all recent changes to experimental mod_md.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900316 13f79535-47bb-0310-9956-ffa450edef68

3 years agoVote
Rainer Jung [Mon, 25 Apr 2022 15:30:36 +0000 (15:30 +0000)] 
Vote
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900266 13f79535-47bb-0310-9956-ffa450edef68

3 years agobackport proposal for recent mod_md changes.
Stefan Eissing [Fri, 22 Apr 2022 08:49:20 +0000 (08:49 +0000)] 
backport proposal for recent mod_md changes.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900146 13f79535-47bb-0310-9956-ffa450edef68

3 years agoPropose.
Rainer Jung [Wed, 20 Apr 2022 21:16:29 +0000 (21:16 +0000)] 
Propose.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900085 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote [skip ci]
Ruediger Pluem [Tue, 19 Apr 2022 13:44:32 +0000 (13:44 +0000)] 
* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900038 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote [skip ci]
Ruediger Pluem [Tue, 19 Apr 2022 13:42:10 +0000 (13:42 +0000)] 
* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900036 13f79535-47bb-0310-9956-ffa450edef68

3 years agoReset vote, use changes-entries, add additional
Rainer Jung [Tue, 19 Apr 2022 09:06:15 +0000 (09:06 +0000)] 
Reset vote, use changes-entries, add additional
fix by ylavic.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900027 13f79535-47bb-0310-9956-ffa450edef68

3 years agoAdding r1899905 for the ap_escape_quotes backport.
Stefan Eissing [Sat, 16 Apr 2022 10:11:20 +0000 (10:11 +0000)] 
Adding r1899905 for the ap_escape_quotes backport.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899907 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote and promote [skip ci]
Ruediger Pluem [Fri, 15 Apr 2022 15:55:53 +0000 (15:55 +0000)] 
* Vote and promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899891 13f79535-47bb-0310-9956-ffa450edef68

3 years agoVote, comment [skip ci]
Yann Ylavic [Fri, 15 Apr 2022 13:26:01 +0000 (13:26 +0000)] 
Vote, comment [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899890 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote
Ruediger Pluem [Fri, 15 Apr 2022 12:06:18 +0000 (12:06 +0000)] 
* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899888 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Add proposal
Ruediger Pluem [Fri, 15 Apr 2022 11:46:44 +0000 (11:46 +0000)] 
* Add proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899887 13f79535-47bb-0310-9956-ffa450edef68

3 years agoAdd proposal.
Rainer Jung [Wed, 13 Apr 2022 12:14:32 +0000 (12:14 +0000)] 
Add proposal.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899810 13f79535-47bb-0310-9956-ffa450edef68

3 years ago- postpoing http2 backport
Stefan Eissing [Wed, 6 Apr 2022 09:21:11 +0000 (09:21 +0000)] 
- postpoing http2 backport
- adding core fix for ap_escape_quotes() on huge strings.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899610 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc rebuild.
Lucien Gentis [Sat, 2 Apr 2022 13:23:17 +0000 (13:23 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899516 13f79535-47bb-0310-9956-ffa450edef68

3 years agoXML files updates.
Lucien Gentis [Sat, 2 Apr 2022 13:20:16 +0000 (13:20 +0000)] 
XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899515 13f79535-47bb-0310-9956-ffa450edef68

3 years agoxforms
Eric Covener [Mon, 28 Mar 2022 00:18:05 +0000 (00:18 +0000)] 
xforms

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899273 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1605841 from trunk:
Eric Covener [Mon, 28 Mar 2022 00:17:39 +0000 (00:17 +0000)] 
Merge r1605841 from trunk:

- ignore <br> inside <dd> too, since ab.xml is using that,
  though it's kind of wrong

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899272 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1899269 from trunk:
Eric Covener [Mon, 28 Mar 2022 00:07:16 +0000 (00:07 +0000)] 
Merge r1899269 from trunk:

add -n warnings/quirks

https://bz.apache.org/bugzilla/show_bug.cgi?id=65980

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899270 13f79535-47bb-0310-9956-ffa450edef68

3 years agoFix a typo.
Christophe Jaillet [Sun, 27 Mar 2022 06:45:09 +0000 (06:45 +0000)] 
Fix a typo.
PR 65978.

Thanks to Stefan Hamburger <apache_f5dosu stefanhamburger.de> for finding it.

(r1899234 in trunk)
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899235 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc rebuild.
Lucien Gentis [Sat, 26 Mar 2022 14:11:51 +0000 (14:11 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899215 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc XML doc file update.
Lucien Gentis [Sat, 26 Mar 2022 14:10:26 +0000 (14:10 +0000)] 
fr doc XML doc file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899214 13f79535-47bb-0310-9956-ffa450edef68

3 years ago'interpolate' is a keyword, not a user-defined string.
Christophe Jaillet [Sat, 26 Mar 2022 06:17:34 +0000 (06:17 +0000)] 
'interpolate' is a keyword, not a user-defined string.
So it should not be in <var></var> in <syntax>  and  <code> should be used instead of <var> in explanations.

While at it, fix some other style issues and missing links spotted here and there.

(t1899205 in trunk)

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899206 13f79535-47bb-0310-9956-ffa450edef68

3 years agopublishing release httpd-2.4.53
Stefan Eissing [Mon, 14 Mar 2022 09:51:39 +0000 (09:51 +0000)] 
publishing release httpd-2.4.53

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898917 13f79535-47bb-0310-9956-ffa450edef68

3 years ago update transformations.
Nilgun Belma Buguner [Sat, 12 Mar 2022 18:17:07 +0000 (18:17 +0000)] 
 update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898882 13f79535-47bb-0310-9956-ffa450edef68

3 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 12 Mar 2022 18:16:32 +0000 (18:16 +0000)] 
update for sync with English docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898881 13f79535-47bb-0310-9956-ffa450edef68

3 years agofr doc rebuild.
Lucien Gentis [Sat, 12 Mar 2022 14:51:23 +0000 (14:51 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898880 13f79535-47bb-0310-9956-ffa450edef68

3 years agoXML files updates.-Cette ligne, et les suivantes ci-dessous, seront ignorées--
Lucien Gentis [Sat, 12 Mar 2022 14:50:30 +0000 (14:50 +0000)] 
XML files updates.-Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    manual/mod/core.xml.fr
M    manual/mod/mod_proxy.xml.fr
M    manual/rewrite/avoid.xml.fr
M    manual/rewrite/flags.xml.fr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898879 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1898771 from trunk:
Ruediger Pluem [Wed, 9 Mar 2022 14:04:15 +0000 (14:04 +0000)] 
Merge r1898771 from trunk:

* Improve detection of _Thread_local

GCC < 4.9 reports __STDC_VERSION__ >= 201112 but does not implement
_Thread_local. Take care of this in the condition.

See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203066

Reviewed by: ylavic, covener, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898786 13f79535-47bb-0310-9956-ffa450edef68

3 years ago* Vote [skip ci]
Ruediger Pluem [Wed, 9 Mar 2022 14:00:33 +0000 (14:00 +0000)] 
* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898785 13f79535-47bb-0310-9956-ffa450edef68

3 years agovote [skip ci]
Eric Covener [Wed, 9 Mar 2022 13:55:52 +0000 (13:55 +0000)] 
vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898784 13f79535-47bb-0310-9956-ffa450edef68

3 years agoPropose r1898771 [skip ci]
Yann Ylavic [Wed, 9 Mar 2022 13:53:03 +0000 (13:53 +0000)] 
Propose r1898771 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898783 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1898735 from trunk:
Ruediger Pluem [Wed, 9 Mar 2022 07:41:40 +0000 (07:41 +0000)] 
Merge r1898735 from trunk:

* Improve the logic flow

Reviewed by: rpluem, covener, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898772 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSync docs [skip ci]
Yann Ylavic [Mon, 7 Mar 2022 16:49:15 +0000 (16:49 +0000)] 
Sync docs [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898708 13f79535-47bb-0310-9956-ffa450edef68

3 years agoMerge r1898702 from trunk:
Stefan Eissing [Mon, 7 Mar 2022 15:46:15 +0000 (15:46 +0000)] 
Merge r1898702 from trunk:

  *) docs: fixing missing closing tag.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898704 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSync CHANGES entries [skip ci]
Yann Ylavic [Mon, 7 Mar 2022 14:53:15 +0000 (14:53 +0000)] 
Sync CHANGES entries [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898696 13f79535-47bb-0310-9956-ffa450edef68

3 years agomod_sed: use size_t to allow for larger buffer sizes and unsigned arithmetics.
Yann Ylavic [Mon, 7 Mar 2022 14:52:42 +0000 (14:52 +0000)] 
mod_sed: use size_t to allow for larger buffer sizes and unsigned arithmetics.

Let's switch to apr_size_t buffers and get rid of the ints.

Merge r1898690 from trunk.
Submitted by: rpluem
Reviewed by: rpluem, covener, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898695 13f79535-47bb-0310-9956-ffa450edef68

3 years agomod_lua: Error out if lua_read_body() or lua_write_body() fail.
Yann Ylavic [Mon, 7 Mar 2022 14:51:19 +0000 (14:51 +0000)] 
mod_lua: Error out if lua_read_body() or lua_write_body() fail.

Otherwise r:requestbody() or r:parsebody() failures might go unnoticed for
the user.

Merge r1898689 from trunk.
Submitted by: rpluem
Reviewed by: rpluem, covener, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898694 13f79535-47bb-0310-9956-ffa450edef68

3 years agocore: Make sure and check that LimitXMLRequestBody fits in system memory.
Yann Ylavic [Mon, 7 Mar 2022 14:48:54 +0000 (14:48 +0000)] 
core: Make sure and check that LimitXMLRequestBody fits in system memory.

LimitXMLRequestBody can not exceed the size needed to ap_escape_html2() the
body without failing to allocate memory, so enforce this at load time based
on APR_SIZE_MAX, and make sure that ap_escape_html2() is within the bounds.

Document the limits for LimitXMLRequestBody in our docs.

Merge r1898686 from trunk.
Submitted by: ylavic, rpluem
Reviewed by: ylavic, covener, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898693 13f79535-47bb-0310-9956-ffa450edef68

3 years agocore: Simpler connection close logic if discarding the request body fails.
Yann Ylavic [Mon, 7 Mar 2022 14:46:08 +0000 (14:46 +0000)] 
core: Simpler connection close logic if discarding the request body fails.

If ap_discard_request_body() sets AP_CONN_CLOSE by itself it simplifies and
allows to consolidate end_output_stream() and error_output_stream().

Merge r1898683 from trunk.
Submitted by: ylavic, rpluem
Reviewed by: ylavic, rpluem, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898692 13f79535-47bb-0310-9956-ffa450edef68