You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/22 06:01:52 UTC
svn commit: r1485047 - in /subversion/branches/1.7.x: ./ STATUS
subversion/svnserve/main.c
Author: svn-role
Date: Wed May 22 04:01:52 2013
New Revision: 1485047
URL: http://svn.apache.org/r1485047
Log:
Merge the 1.7.x-r1482759 branch:
* r1482759, r1482779
Prevent svnserve from exiting when a client connection is aborted.
Justification:
DoS against svnserve possible.
Branch:
^/subversion/branches/1.7.x-r1482759
Votes:
+1: stsp, breser, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svnserve/main.c (contents, props changed)
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-r1482759:r1483584-1485046
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1485047&r1=1485046&r2=1485047&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May 22 04:01:52 2013
@@ -301,12 +301,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1482759, r1482779
- Prevent svnserve from exiting when a client connection is aborted.
- Justification:
- DoS against svnserve possible.
- Branch:
- ^/subversion/branches/1.7.x-r1482759
- Votes:
- +1: stsp, breser, philip
Modified: subversion/branches/1.7.x/subversion/svnserve/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svnserve/main.c?rev=1485047&r1=1485046&r2=1485047&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svnserve/main.c (original)
+++ subversion/branches/1.7.x/subversion/svnserve/main.c Wed May 22 04:01:52 2013
@@ -963,7 +963,9 @@ int main(int argc, const char *argv[])
connection_pool) == APR_CHILD_DONE)
;
}
- if (APR_STATUS_IS_EINTR(status))
+ if (APR_STATUS_IS_EINTR(status)
+ || APR_STATUS_IS_ECONNABORTED(status)
+ || APR_STATUS_IS_ECONNRESET(status))
{
svn_pool_destroy(connection_pool);
continue;
Propchange: subversion/branches/1.7.x/subversion/svnserve/main.c
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/svnserve/svnserve.c:r1482759,1482779
Merged /subversion/branches/1.7.x-r1482759/subversion/svnserve/main.c:r1483584-1485046