You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/05/16 23:58:35 UTC
svn commit: r1483585 -
/subversion/branches/1.7.x-r1482759/subversion/svnserve/main.c
Author: breser
Date: Thu May 16 21:58:35 2013
New Revision: 1483585
URL: http://svn.apache.org/r1483585
Log:
Merge r1482759 and r1482779 from trunk onto the 1.7.x-r1482759 branch.
Used the following command to avoid conflicts:
svn merge -c r1482759,r1482779 \
^/subversion/trunk/subversion/svnserve/svnserve.c \
subversion/svnserve/main.c
Modified:
subversion/branches/1.7.x-r1482759/subversion/svnserve/main.c (contents, props changed)
Modified: subversion/branches/1.7.x-r1482759/subversion/svnserve/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1482759/subversion/svnserve/main.c?rev=1483585&r1=1483584&r2=1483585&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1482759/subversion/svnserve/main.c (original)
+++ subversion/branches/1.7.x-r1482759/subversion/svnserve/main.c Thu May 16 21:58:35 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-r1482759/subversion/svnserve/main.c
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/svnserve/svnserve.c:r1482759,1482779