com php-src: backported ext/standard: ext/standard/array.c ext/standard/basic_functions.c ext/standard/dns_win3 2.c ext/standard/file.c
ext/standard/ftp_fopen_wr apper.c ext/standard/http_fopen_wrapper.c ext/stand ard/type.c

From: Date: Sat, 15 Feb 2014 19:16:05 +0000
Subject: com php-src: backported ext/standard: ext/standard/array.c ext/standard/basic_functions.c ext/standard/dns_win3 2.c ext/standard/file.c
ext/standard/ftp_fopen_wr apper.c ext/standard/http_fopen_wrapper.c ext/stand ard/type.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76078@lists.php.net to get a copy of this message
Commit: f6b64e93dd00ee8e7a1b7b29fca1571097f11d30 Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 20:16:05 +0100 Parents: 533dab176c7c2460d6a7e9cd91b0cbf9ce580292 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f6b64e93dd00ee8e7a1b7b29fca1571097f11d30 Log: backported ext/standard Changed paths: M ext/standard/array.c M ext/standard/basic_functions.c M ext/standard/dns_win32.c M ext/standard/file.c M ext/standard/ftp_fopen_wrapper.c M ext/standard/http_fopen_wrapper.c M ext/standard/type.c Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index aea27d3..1b6da06 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4005,7 +4005,6 @@ PHP_FUNCTION(array_multisort) } /* }}} */ -/* XXX not finished yet, continue after php_rand is worky on 64 bit */ /* {{{ proto mixed array_rand(array input [, int num_req]) Return key/keys for random entry/entries in the array */ PHP_FUNCTION(array_rand) @@ -4279,7 +4278,7 @@ PHP_FUNCTION(array_filter) fci.params = args; if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && retval) { - int retval_true = zend_is_true(retval TSRMLS_CC); + int retval_true = zend_is_true(retval); zval_ptr_dtor(&retval); if (use_type) { @@ -4292,7 +4291,7 @@ PHP_FUNCTION(array_filter) php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred while invoking the filter callback"); return; } - } else if (!zend_is_true(*operand TSRMLS_CC)) { + } else if (!zend_is_true(*operand)) { continue; } diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 3020b1b..b4d1184 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5755,7 +5755,7 @@ PHP_FUNCTION(register_tick_function) zend_llist_init(BG(user_tick_functions), sizeof(user_tick_function_entry), (llist_dtor_func_t) user_tick_function_dtor, 0); - php_add_tick_function(run_user_tick_functions TSRMLS_CC); + php_add_tick_function(run_user_tick_functions); } for (i = 0; i < tick_fe.arg_count; i++) { diff --git a/ext/standard/dns_win32..c b/ext/standard/dns_win32.c index 3a6d17f..555a9ae 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -334,7 +334,7 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw, #endif default: - /* unkown type */ + /* unknown type */ zval_ptr_dtor(subarray); *subarray = NULL; return; diff --git a/ext/standard/file.c b/ext/standard/file.c index b7087a6..4328831 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1396,7 +1396,7 @@ PHP_FUNCTION(umask) if (BG(umask) == -1) { BG(umask) = oldumask; } - + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|i", &arg1) == FAILURE) { RETURN_FALSE; } diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index af8f660..3a802ea 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -572,7 +572,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, const char *pa goto errexit; } - php_stream_context_set(datastream, context TSRMLS_CC); + php_stream_context_set(datastream, context); php_stream_notify_progress_init(context, 0, file_size); if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream, @@ -746,7 +746,7 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *pat goto opendir_errexit; } - php_stream_context_set(datastream, context TSRMLS_CC); + php_stream_context_set(datastream, context); if (use_ssl_on_data && (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 || diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index cbe81f9..1ea8503 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -337,7 +337,7 @@ finish: eol_detect = stream->flags & (PHP_STREAM_FLAG_DETECT_EOL | PHP_STREAM_FLAG_EOL_MAC); stream->flags &= ~(PHP_STREAM_FLAG_DETECT_EOL | PHP_STREAM_FLAG_EOL_MAC); - php_stream_context_set(stream, context TSRMLS_CC); + php_stream_context_set(stream, context); php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0); @@ -682,7 +682,7 @@ finish: response_code = 0; } if (context && SUCCESS==php_stream_context_get_option(context, "http", "ignore_errors", &tmpzval)) { - ignore_errors = zend_is_true(*tmpzval TSRMLS_CC); + ignore_errors = zend_is_true(*tmpzval); } /* when we request only the header, don't fail even on error codes */ if ((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) { diff --git a/ext/standard/type.c b/ext/standard/type.c index 1a12aa0..6a2e906 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -186,7 +186,7 @@ PHP_FUNCTION(boolval) return; } - RETURN_BOOL(zend_is_true(*val TSRMLS_CC)); + RETURN_BOOL(zend_is_true(*val)); } /* }}} */

« previous php.cvs (#76078) next »