diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
| commit | a3322f8927618a8cadbef4ae2121084b44a564d3 (patch) | |
| tree | 939a94efa58136e851e478e070daf89edaa18376 /ext/pcntl | |
| parent | eb012cf88440423ff02c46421f29a1c6e850702c (diff) | |
| parent | 896ac689c91967dec0601fa9fe048c518da52a3c (diff) | |
| download | php-git-a3322f8927618a8cadbef4ae2121084b44a564d3.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
Diffstat (limited to 'ext/pcntl')
| -rwxr-xr-x | ext/pcntl/pcntl.c | 8 | ||||
| -rw-r--r-- | ext/pcntl/tests/pcntl_exec_3.phpt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index ecb51c1f5e..108119a0bf 100755 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -816,7 +816,7 @@ PHP_FUNCTION(pcntl_exec) if (execve(path, argv, envp) == -1) { PCNTL_G(last_error) = errno; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno)); } /* Cleanup */ @@ -826,7 +826,7 @@ PHP_FUNCTION(pcntl_exec) if (execv(path, argv) == -1) { PCNTL_G(last_error) = errno; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno)); } } @@ -1127,7 +1127,7 @@ PHP_FUNCTION(pcntl_getpriority) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Invalid identifier flag", errno); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno); break; } RETURN_FALSE; @@ -1167,7 +1167,7 @@ PHP_FUNCTION(pcntl_setpriority) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d: Only a super user may attempt to increase the process priority", errno); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occured", errno); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error %d has occurred", errno); break; } RETURN_FALSE; diff --git a/ext/pcntl/tests/pcntl_exec_3.phpt b/ext/pcntl/tests/pcntl_exec_3.phpt index d27c1c9962..5349381d92 100644 --- a/ext/pcntl/tests/pcntl_exec_3.phpt +++ b/ext/pcntl/tests/pcntl_exec_3.phpt @@ -13,5 +13,5 @@ unlink($file); Warning: pcntl_exec() expects at least 1 parameter, 0 given %s NULL -Warning: pcntl_exec(): Error has occured: (errno %d) %s +Warning: pcntl_exec(): Error has occurred: (errno %d) %s bool(false) |