Add optional signal parameter to proc_terminate.

diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index 993e8761274b4e04e5a1289d41b54bc164fc84af..367d4dded87d8d6ee358d1adda4772e18462a8c2 100644 (file)
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -175,14 +175,15 @@ PHP_MINIT_FUNCTION(proc_open)
 }
 
 
-/* {{{ proto int proc_terminate(resource process)
+/* {{{ proto int proc_terminate(resource process [, long signal])
    kill a process opened by proc_open */
 PHP_FUNCTION(proc_terminate)
 {
        zval *zproc;
        struct php_process_handle *proc;
+       long sig_no = SIGTERM;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zproc) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zproc, &sig_no) == FAILURE) {
                RETURN_FALSE;
        }
 
@@ -191,7 +192,7 @@ PHP_FUNCTION(proc_terminate)
 #ifdef PHP_WIN32
        TerminateProcess(proc->child, 255);
 #else
-       kill(proc->child, SIGTERM);
+       kill(proc->child, sig_no);
 #endif
        
        zend_list_delete(Z_LVAL_P(zproc));