Author: jun66j5
Date: Wed Jan 31 09:02:09 2024
New Revision: 1915492
URL: http://svn.apache.org/viewvc?rev=1915492&view=rev
Log:
Follow-up to r1908547, prevent error message when receiving SIGTERM/SIGINT to
stop svnserve process.
* subversion/svnserve/svnserve.c
(accept_connection): Return `SVN_NO_ERROR` rather than the error when
interrupted by SIGTERM/SIGINT.
Reviewed by: dsahlberg
Modified:
subversion/trunk/subversion/svnserve/svnserve.c
Modified: subversion/trunk/subversion/svnserve/svnserve.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/svnserve.c?rev=1915492&r1=1915491&r2=1915492&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/svnserve.c (original)
+++ subversion/trunk/subversion/svnserve/svnserve.c Wed Jan 31 09:02:09 2024
@@ -574,9 +574,14 @@ accept_connection(connection_t **connect
|| APR_STATUS_IS_ECONNABORTED(status)
|| APR_STATUS_IS_ECONNRESET(status));
- return status
- ? svn_error_wrap_apr(status, _("Can't accept client connection"))
- : SVN_NO_ERROR;
+ if (!status)
+ return SVN_NO_ERROR;
+#if APR_HAVE_SIGACTION
+ else if (sigtermint_seen)
+ return SVN_NO_ERROR;
+#endif
+ else
+ return svn_error_wrap_apr(status, _("Can't accept client connection"));
}
/* Add a reference to CONNECTION, i.e. keep it and it's pool valid unless
