Skip to content

Commit 2840f91

Browse files
committed
Split mod_proxy_fcgi backports in two, the showstopper (BZ-69203) and fixup for
proxy-fcgi-pathinfo=full, thus reset Ruediger's vote. Move showstopper proposals to their section (BZ-69203 and BZ-69235/69260/56264) instead of the BZ refs. Re-add my vote for r1920597. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1921239 13f79535-47bb-0310-9956-ffa450edef68
1 parent fc2f7c5 commit 2840f91

File tree

1 file changed

+29
-26
lines changed

1 file changed

+29
-26
lines changed

STATUS

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,29 @@ CURRENT RELEASE NOTES:
153153

154154
RELEASE SHOWSTOPPERS:
155155

156-
- PR69235 (UDS+rewrite?)
157-
- PR69260 (dup of above)
158-
- PR69203 (FPM)
156+
*) mod_proxy_fcgi: Don't re-encode SCRIPT_FILENAME when set via SetHandler. PR 69203.
157+
trunk patch: https://svn.apache.org/r1919620
158+
https://svn.apache.org/r1919621
159+
https://svn.apache.org/r1919623
160+
https://svn.apache.org/r1919628
161+
https://svn.apache.org/r1921237
162+
2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/470.diff
163+
PR: https://github.com/apache/httpd/pull/470
164+
+1: ylavic,
159165

166+
*) mod_rewrite, mod_proxy: mod_proxy to cononicalize rewritten [P] URLs,
167+
including "unix:" ones. PR 69235, PR 69260, PR 56264
168+
Trunk version of patch:
169+
https://svn.apache.org/r1838684
170+
https://svn.apache.org/r1920570
171+
https://svn.apache.org/r1920571
172+
https://svn.apache.org/r1920572
173+
Backport version for 2.4.x of patch:
174+
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/484.diff
175+
Can be applied via apply_backport_pr.sh 484
176+
+1: rpluem, ylavic
177+
covener: what about remaining parts of https://bz.apache.org/bugzilla/show_bug.cgi?id=69203 ? 69260 was marked dup of 69203.
178+
ylavic: BZ-69203 is addressed in mod_proxy_fcgi proposal above (https://github.com/apache/httpd/pull/470)
160179

161180
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
162181
[ start all new proposals below, under PATCHES PROPOSED. ]
@@ -192,16 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
192211
PR: https://github.com/apache/httpd/pull/469
193212
+1: ylavic, rpluem
194213

195-
*) mod_proxy_fcgi: Don't re-encode SCRIPT_FILENAME when set via SetHandler. PR 69203.
196-
trunk patch: https://svn.apache.org/r1919547
197-
https://svn.apache.org/r1919620
198-
https://svn.apache.org/r1919621
199-
https://svn.apache.org/r1919623
200-
https://svn.apache.org/r1919628
201-
2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/470.diff
202-
PR: https://github.com/apache/httpd/pull/470
203-
+1: ylavic, covener
204-
205214
*) CMake: Remove awk dependency when building using CMake. Before this awk was
206215
required for -DWITH_MODULES option.
207216
trunk patch: https://svn.apache.org/r1919413
@@ -216,20 +225,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
216225
trunk patch: https://svn.apache.org/r1920597
217226
https://svn.apache.org/r1921076
218227
2.4.x patch: svn merge -c 1920597 -c 1921076 ^/httpd/httpd/trunk .
219-
+1: jorton,
228+
+1: jorton, ylavic,
220229

221-
*) mod_rewrite, mod_proxy: mod_proxy to cononicalize rewritten [P] URLs,
222-
including "unix:" ones. PR 69235, PR 69260, PR 56264
223-
Trunk version of patch:
224-
https://svn.apache.org/r1838684
225-
https://svn.apache.org/r1920570
226-
https://svn.apache.org/r1920571
227-
https://svn.apache.org/r1920572
228-
Backport version for 2.4.x of patch:
229-
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/484.diff
230-
Can be applied via apply_backport_pr.sh 484
231-
+1: rpluem, ylavic
232-
covener: what about remaining parts of https://bz.apache.org/bugzilla/show_bug.cgi?id=69203 ? 69260 was marked dup of 69203.
230+
*) mod_proxy_fcgi: Fix proxy-fcgi-pathinfo=full
231+
trunk patch: https://svn.apache.org/r1919547
232+
https://svn.apache.org/r1921238
233+
2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/489.diff
234+
PR: https://github.com/apache/httpd/pull/489
235+
+1: ylavic,
233236

234237

235238
PATCHES/ISSUES THAT ARE BEING WORKED

0 commit comments

Comments
 (0)