Imported Upstream version 5.3.7upstream/5.3.7

7 files changed, 18 insertions, 7 deletions

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index b2e411849..ad8c29ed9 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: pcntl.c 306939 2011-01-01 02:19:59Z felipe $ */
+/* $Id: pcntl.c 313665 2011-07-25 11:42:53Z felipe $ */
 
 #define PCNTL_DEBUG 0
 
@@ -172,7 +172,7 @@ const zend_function_entry pcntl_functions[] = {
 	PHP_FE(pcntl_sigwaitinfo,	arginfo_pcntl_sigwaitinfo)
 	PHP_FE(pcntl_sigtimedwait,	arginfo_pcntl_sigtimedwait)
 #endif
-	{NULL, NULL, NULL}	
+	PHP_FE_END
 };
 
 zend_module_entry pcntl_module_entry = {
diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt
index 756fc959c..9d2ec1dcf 100644
--- a/ext/pcntl/tests/pcntl_exec.phpt
+++ b/ext/pcntl/tests/pcntl_exec.phpt
@@ -1,7 +1,10 @@
 --TEST--
 pcntl_exec()
 --SKIPIF--
-<?php if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set"); ?>
+<?php 
+if (!extension_loaded("pcntl")) print "skip"; 
+if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set");
+?>
 --FILE--
 <?php
 echo "ok\n";
diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt b/ext/pcntl/tests/pcntl_exec_2.phpt
index d1672d2a3..02b5e22aa 100644
--- a/ext/pcntl/tests/pcntl_exec_2.phpt
+++ b/ext/pcntl/tests/pcntl_exec_2.phpt
@@ -1,7 +1,12 @@
 --TEST--
 pcntl_exec() 2
 --SKIPIF--
-<?php if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set"); ?>
+<?php
+
+if (!extension_loaded("pcntl")) print "skip"; 
+if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set");
+
+?>
 --FILE--
 <?php
 if (getenv("PCNTL_EXEC_TEST_IS_CHILD")) {
diff --git a/ext/pcntl/tests/pcntl_exec_3.phpt b/ext/pcntl/tests/pcntl_exec_3.phpt
index 1017593b5..d27c1c996 100644
--- a/ext/pcntl/tests/pcntl_exec_3.phpt
+++ b/ext/pcntl/tests/pcntl_exec_3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 pcntl_exec() 3
+--SKIPIF--
+<?php if (!extension_loaded("pcntl")) print "skip"; ?>
 --FILE--
 <?php
 var_dump(pcntl_exec());
diff --git a/ext/pcntl/tests/pcntl_fork_basic.phpt b/ext/pcntl/tests/pcntl_fork_basic.phpt
index 82759ba32..b1e2a9bf6 100644
--- a/ext/pcntl/tests/pcntl_fork_basic.phpt
+++ b/ext/pcntl/tests/pcntl_fork_basic.phpt
@@ -11,7 +11,7 @@ Francesco Fullone ff@ideato.it
 ?>
 --FILE--
 <?php
-echo "*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***\n";
+echo "*** Test by calling method or function with its expected arguments, first print the child PID and the father ***\n";
 
 $pid = pcntl_fork();
 if ($pid > 0) {
@@ -22,6 +22,6 @@ if ($pid > 0) {
 }
 ?>
 --EXPECTF--
-*** Test by calling method or function with its expected arguments, first print the child PID and the the father ***
+*** Test by calling method or function with its expected arguments, first print the child PID and the father ***
 int(0)
 int(%d)
diff --git a/ext/pcntl/tests/pcntl_signal.phpt b/ext/pcntl/tests/pcntl_signal.phpt
index 977f26fbc..3f894fa3f 100644
--- a/ext/pcntl/tests/pcntl_signal.phpt
+++ b/ext/pcntl/tests/pcntl_signal.phpt
@@ -1,6 +1,7 @@
 --TEST--
 pcntl_signal()
 --SKIPIF--
+<?php if (!extension_loaded("pcntl")) print "skip"; ?>
 <?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_wait.phpt b/ext/pcntl/tests/pcntl_wait.phpt
index 266bb399e..c304c8431 100644
--- a/ext/pcntl/tests/pcntl_wait.phpt
+++ b/ext/pcntl/tests/pcntl_wait.phpt
@@ -1,8 +1,8 @@
 --TEST--
 pcntl_wait()
 --SKIPIF--
+<?php if (!extension_loaded("pcntl")) print "skip"; ?>
 <?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?>
-<?php 
 --FILE--
 <?php
 $pid = pcntl_fork();