Skip to content

Commit 92d9f50

Browse files
committed
* Add revision to address jailletc36 concern and reset votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926092 13f79535-47bb-0310-9956-ffa450edef68
1 parent 1ad37ff commit 92d9f50

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

STATUS

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -193,26 +193,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
193193
svn merge -c 1925109 ^/httpd/httpd/trunk .
194194
+1: rpluem, covener, ylavic
195195

196-
*) mod_systemd: Add systemd socket activation
197-
Trunk version of patch:
198-
https://svn.apache.org/r1511033
199-
https://svn.apache.org/r1528032
200-
https://svn.apache.org/r1608686
201-
https://svn.apache.org/r1608694
202-
https://svn.apache.org/r1608703
203-
https://svn.apache.org/r1838271
204-
https://svn.apache.org/r1899784
205-
https://svn.apache.org/r1916312
206-
https://svn.apache.org/r1916344
207-
Backport version for 2.4.x of patch:
208-
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/515.diff
209-
Can be applied via apply_backport_pr.sh 515
210-
+1: rpluem, jorton, ylavic
211-
jailletc36: Should the apr_palloc() in alloc_systemd_listener() be
212-
apr_pcalloc() so that all fields are 0?
213-
make_sock() uses the 'flags' field that would be
214-
undefined otherwise.
215-
216196
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
217197
[ New proposals should be added at the end of the list ]
218198

@@ -248,6 +228,28 @@ PATCHES/ISSUES THAT ARE BEING WORKED
248228
does a minor bump only.
249229
minfrin: Two new directives need to be documented.
250230

231+
*) mod_systemd: Add systemd socket activation
232+
Trunk version of patch:
233+
https://svn.apache.org/r1511033
234+
https://svn.apache.org/r1528032
235+
https://svn.apache.org/r1608686
236+
https://svn.apache.org/r1608694
237+
https://svn.apache.org/r1608703
238+
https://svn.apache.org/r1838271
239+
https://svn.apache.org/r1899784
240+
https://svn.apache.org/r1916312
241+
https://svn.apache.org/r1916344
242+
https://svn.apache.org/r1926091
243+
Backport version for 2.4.x of patch:
244+
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/515.diff
245+
Can be applied via apply_backport_pr.sh 515
246+
+1: rpluem,
247+
jailletc36: Should the apr_palloc() in alloc_systemd_listener() be
248+
apr_pcalloc() so that all fields are 0?
249+
make_sock() uses the 'flags' field that would be
250+
undefined otherwise.
251+
rpluem says: Good catch. Added r1926091 and reset votes.
252+
251253
PATCHES/ISSUES THAT ARE STALLED
252254

253255
*) core: avoid duplicate headers when using ap_send_error_response.

0 commit comments

Comments
 (0)