diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-03-14 14:19:41 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-14 14:19:41 +0400 |
| commit | dd1c358d1bf8fd492e39d46f93878d47a3b6d257 (patch) | |
| tree | 5c8923188500c17d085a289a0c70f610f521b9cb /ext/com_dotnet/com_saproxy.c | |
| parent | d77c865aff794826f6286c078268db6a005fea33 (diff) | |
| parent | c09652c2899dd4149fe3187b5b50f6b3c54da384 (diff) | |
| download | php-git-dd1c358d1bf8fd492e39d46f93878d47a3b6d257.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
fix the fix
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Forgot to remove some now unused variables
Add support for non-scalar Iterator keys in foreach
fixed headers order
- Updated to version 2013.2 (2013b)
fixed the test
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
Disable zend_always_inline in debug build
Diffstat (limited to 'ext/com_dotnet/com_saproxy.c')
| -rw-r--r-- | ext/com_dotnet/com_saproxy.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index ad92849743..5450370cd9 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -519,16 +519,15 @@ static void saproxy_iter_get_data(zend_object_iterator *iter, zval ***data TSRML *data = ptr_ptr; } -static int saproxy_iter_get_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, - ulong *int_key TSRMLS_DC) +static void saproxy_iter_get_key(zend_object_iterator *iter, zval *key TSRMLS_DC) { php_com_saproxy_iter *I = (php_com_saproxy_iter*)iter->data; if (I->key == -1) { - return HASH_KEY_NON_EXISTANT; + ZVAL_NULL(key); + } else { + ZVAL_LONG(key, I->key); } - *int_key = (ulong)I->key; - return HASH_KEY_IS_LONG; } static int saproxy_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC) |