apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1534121 - in /apr/apr/branches/1.5.x: ./ include/apr_thread_proc.h
Date Mon, 21 Oct 2013 12:16:52 GMT
Author: trawick
Date: Mon Oct 21 12:16:51 2013
New Revision: 1534121

URL: http://svn.apache.org/r1534121
Log:
merge r10811462 and 1523845 from trunk:

more hints on APR_KILL_NEVER

typo in comment

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/include/apr_thread_proc.h

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1081462,1523845

Modified: apr/apr/branches/1.5.x/include/apr_thread_proc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_thread_proc.h?rev=1534121&r1=1534120&r2=1534121&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_thread_proc.h (original)
+++ apr/apr/branches/1.5.x/include/apr_thread_proc.h Mon Oct 21 12:16:51 2013
@@ -197,7 +197,9 @@ typedef struct apr_other_child_rec_t  ap
 typedef void *(APR_THREAD_FUNC *apr_thread_start_t)(apr_thread_t*, void*);
 
 typedef enum {
-    APR_KILL_NEVER,             /**< process is never sent any signals */
+    APR_KILL_NEVER,             /**< process is never killed (i.e., never sent
+                                 * any signals), but it will be reaped if it exits
+                                 * before the pool is cleaned up */
     APR_KILL_ALWAYS,            /**< process is sent SIGKILL on apr_pool_t cleanup */
     APR_KILL_AFTER_TIMEOUT,     /**< SIGTERM, wait 3 seconds, SIGKILL */
     APR_JUST_WAIT,              /**< wait forever for the process to complete */
@@ -632,7 +634,7 @@ APR_DECLARE(apr_status_t) apr_proc_creat
  *            APR_NOWAIT -- return immediately regardless of if the 
  *                          child is dead or not.
  * </PRE>
- * @remark The childs status is in the return code to this process.  It is one of:
+ * @remark The child's status is in the return code to this process.  It is one of:
  * <PRE>
  *            APR_CHILD_DONE     -- child is no longer running.
  *            APR_CHILD_NOTDONE  -- child is still running.



Mime
View raw message