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:02:10 UTC
svn commit: r1485049 - in /subversion/branches/1.8.x: ./ STATUS
subversion/svnserve/svnserve.c
Author: svn-role
Date: Wed May 22 04:02:10 2013
New Revision: 1485049
URL: http://svn.apache.org/r1485049
Log:
Merge the r1482759 group from trunk:
* r1482759, r1482779
Prevent svnserve from exiting when a client connection is aborted.
Justification:
DoS against svnserve possible.
Votes:
+1: stsp, rhuijben, philip, breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svnserve/svnserve.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1482759,1482779
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1485049&r1=1485048&r2=1485049&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 22 04:02:10 2013
@@ -143,13 +143,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1482759, r1482779
- Prevent svnserve from exiting when a client connection is aborted.
- Justification:
- DoS against svnserve possible.
- Votes:
- +1: stsp, rhuijben, philip, breser
-
* r1482724
Fix a link error when configured with --enable-runtime-module-search.
Justification:
Modified: subversion/branches/1.8.x/subversion/svnserve/svnserve.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnserve/svnserve.c?rev=1485049&r1=1485048&r2=1485049&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnserve/svnserve.c (original)
+++ subversion/branches/1.8.x/subversion/svnserve/svnserve.c Wed May 22 04:02:10 2013
@@ -1043,7 +1043,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;