You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/10/13 13:51:03 UTC
svn commit: r1531670 - /httpd/httpd/branches/2.2.x/STATUS
Author: minfrin
Date: Sun Oct 13 11:51:03 2013
New Revision: 1531670
URL: http://svn.apache.org/r1531670
Log:
Vote, comment.
Modified:
httpd/httpd/branches/2.2.x/STATUS
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1531670&r1=1531669&r2=1531670&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Oct 13 11:51:03 2013
@@ -126,7 +126,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
* mod_dav: Fix 55306. Don't require lock tokens for COPY source.
trunk patches: https://svn.apache.org/r1528718
2.2.x: trunk works, CHANGES needs to be written when merging
- +1: breser
+ +1: breser, minfrin
* mod_dav: Fix 55397. dav_resource->uri treated as unencoded. This was an
unnecessary ABI changed introduced in 2.2.25
@@ -135,6 +135,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
2.4.x: trunk works, CHANGES needs to be written when merging
2.2.x: https://people.apache.org/~breser/httpd/2.2.x/patches/pr55397.patch
+1: breser
+ minfrin: r1529559 puts modules/dav/fs/repos.c into conflict for me
PATCHES/ISSUES THAT ARE STALLED
Re: svn commit: r1531670 - /httpd/httpd/branches/2.2.x/STATUS
Posted by Ben Reser <be...@reser.org>.
On 10/13/13 4:51 AM, minfrin@apache.org wrote:
> Author: minfrin
> Date: Sun Oct 13 11:51:03 2013
> New Revision: 1531670
>
> URL: http://svn.apache.org/r1531670
> Log:
> Vote, comment.
>
> Modified:
> httpd/httpd/branches/2.2.x/STATUS
>
> Modified: httpd/httpd/branches/2.2.x/STATUS
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1531670&r1=1531669&r2=1531670&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/STATUS (original)
> +++ httpd/httpd/branches/2.2.x/STATUS Sun Oct 13 11:51:03 2013
> @@ -126,7 +126,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
> * mod_dav: Fix 55306. Don't require lock tokens for COPY source.
> trunk patches: https://svn.apache.org/r1528718
> 2.2.x: trunk works, CHANGES needs to be written when merging
> - +1: breser
> + +1: breser, minfrin
>
> * mod_dav: Fix 55397. dav_resource->uri treated as unencoded. This was an
> unnecessary ABI changed introduced in 2.2.25
> @@ -135,6 +135,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
> 2.4.x: trunk works, CHANGES needs to be written when merging
> 2.2.x: https://people.apache.org/~breser/httpd/2.2.x/patches/pr55397.patch
> +1: breser
> + minfrin: r1529559 puts modules/dav/fs/repos.c into conflict for me
That's why there's a patch file for 2.2.x. There are some minor conflicts from
some code cleanup that happened between 2.2.x and 2.4.x.