diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-22 10:58:57 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-22 10:58:57 -0700 |
| commit | a1bf38e075ce7d6bbcbcf570444f13ea7558fa41 (patch) | |
| tree | aa492ea45da770d6e6db85dba336945a02765739 /ext/sybase_ct/php_sybase_ct.c | |
| parent | c7ee677f2f330bbcc8721b6a84dd3a05dc0c5541 (diff) | |
| parent | 25f924abf62e70f3474b5885c12a521c68c2066d (diff) | |
| download | php-git-a1bf38e075ce7d6bbcbcf570444f13ea7558fa41.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Anatol Belski (8) and others
# Via Anatol Belski (2) and others
* 'PHP-5.4' of https://git.php.net/repository/php-src: (44 commits)
fixed possible null deref
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Fixed bug #65304 (Use of max int in array_sum)
Reorder NEWS
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Properly fixed bug #63186 on NetBSD == 6.0
Improve php.ini-* documentation
5.4.19 is next
Fixed bug #50308 - session id not appended properly for empty anchor tags
Fix bug #62129 - rfc1867 crashes php even though turned off
add news for xml fix
fix TS build
added sapi check for dl() test
Make zval2myslqnd implementations aware of inheritance
Fixed typo ensuring header str is \0 terminated
fix buffer overrun
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
...
Diffstat (limited to 'ext/sybase_ct/php_sybase_ct.c')
| -rw-r--r-- | ext/sybase_ct/php_sybase_ct.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index bd4cf1429c..ee53d484cf 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -1121,7 +1121,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC) break; case CS_CMD_FAIL: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Command failed, cancelling rest"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Command failed, canceling rest"); ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL); fail = 1; break; @@ -1131,7 +1131,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC) case CS_PARAM_RESULT: case CS_ROW_RESULT: /* Unexpected results, cancel them. */ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, cancelling current"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, canceling current"); ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_CURRENT); break; @@ -1141,7 +1141,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC) break; default: - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, cancelling all"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, canceling all"); ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL); break; } @@ -1696,7 +1696,7 @@ PHP_FUNCTION(sybase_free_result) /* Did we fetch up until the end? */ if (result->last_retcode != CS_END_DATA && result->last_retcode != CS_END_RESULTS) { - /* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cancelling the rest of the results"); */ + /* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: canceling the rest of the results"); */ ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL); php_sybase_finish_results(result TSRMLS_CC); } |