Commit: 8432557dcda79c298c1fcfd47440940e398afaa4
Author: Anatol Belski <a...@php.net> Wed, 18 Dec 2013 15:07:42 +0100
Parents: fcb28ea97f97cd85be1242fbb16ba5bca29f1cc7
a8a36b7d52bc8b00dd8a6cbe32b1875b4c41cbcf
Branches: str_size_and_int64
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8432557dcda79c298c1fcfd47440940e398afaa4
Log:
Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
Zend/zend.c
Zend/zend.h
Zend/zend_execute.h
Zend/zend_vm_execute.h
main/SAPI.h
Changed paths:
MM Zend/zend.c
MM Zend/zend.h
MM Zend/zend_execute.h
MM Zend/zend_execute_API.c
MM Zend/zend_interfaces.c
MM Zend/zend_object_handlers.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/dom/php_dom.c
MM ext/mysqlnd/mysqlnd_net.c
MM ext/opcache/Optimizer/block_pass.c
MM ext/pcntl/pcntl.c
MM ext/soap/php_encoding.c
MM ext/spl/spl_array.c
MM ext/spl/spl_directory.c
MM ext/spl/spl_fixedarray.c
MM ext/spl/spl_iterators.c
MM ext/standard/array.c
MM ext/standard/basic_functions.c
MM ext/standard/ftp_fopen_wrapper.c
MM ext/standard/http_fopen_wrapper.c
MM ext/standard/type.c
MM ext/zip/php_zip.c
MM main/SAPI.c
MM main/SAPI.h
MM main/php_ini.c
MM main/streams/streams.c
MM main/streams/transports.c
MM main/streams/userspace.c
MM sapi/apache2handler/sapi_apache2.c
MM sapi/cgi/cgi_main.c
MM sapi/cli/php_cli.c
MM sapi/cli/php_cli_server.c
MM sapi/embed/php_embed.c
diff --cc Zend/zend.c
index 13dec8a,ad45028..c20e1ba
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@@ -56,11 -56,11 +56,11 @@@ ZEND_API FILE *(*zend_fopen)(const cha
ZEND_API int (*zend_stream_open_function)(const char *filename,
zend_file_handle *handle TSRMLS_DC);
ZEND_API void (*zend_block_interruptions)(void);
ZEND_API void (*zend_unblock_interruptions)(void);
- ZEND_API void (*zend_ticks_function)(int ticks);
+ ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC);
-ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const
uint error_lineno, const char *format, va_list args);
-int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format,
va_list ap);
+ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const
zend_str_size_uint error_lineno, const char *format, va_list args);
- zend_str_size_int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t
max_len, const char *format, va_list ap);
++int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t max_len, const char
*format, va_list ap);
ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
-ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len
TSRMLS_DC);
+ZEND_API char *(*zend_resolve_path)(const char *filename, zend_str_size_int
filename_len TSRMLS_DC);
void (*zend_on_timeout)(int seconds TSRMLS_DC);
diff --cc Zend/zend.h
index f002aeb,f60ef68..3773946
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@@ -542,20 -542,20 +542,20 @@@ struct _zend_class_entry
#include "zend_stream.h"
typedef struct _zend_utility_functions {
- void (*error_function)(int type, const char *error_filename, const uint
error_lineno, const char *format, va_list args)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
- int (*printf_function)(const char *format, ...)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
- int (*write_function)(const char *str, uint str_length);
+ void (*error_function)(int type, const char *error_filename, const
zend_str_size_uint error_lineno, const char *format, va_list args)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
+ zend_str_size_int (*printf_function)(const char *format, ...)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
+ zend_str_size_int (*write_function)(const char *str, zend_str_size_uint
str_length);
FILE *(*fopen_function)(const char *filename, char **opened_path
TSRMLS_DC);
- void (*message_handler)(long message, const void *data TSRMLS_DC);
+ void (*message_handler)(zend_int_t message, const void *data TSRMLS_DC);
void (*block_interruptions)(void);
void (*unblock_interruptions)(void);
- int (*get_configuration_directive)(const char *name, uint name_length,
zval *contents);
+ int (*get_configuration_directive)(const char *name, zend_str_size_uint
name_length, zval *contents);
- void (*ticks_function)(int ticks);
+ void (*ticks_function)(int ticks TSRMLS_DC);
void (*on_timeout)(int seconds TSRMLS_DC);
int (*stream_open_function)(const char *filename, zend_file_handle
*handle TSRMLS_DC);
- int (*vspprintf_function)(char **pbuf, size_t max_len, const char
*format, va_list ap);
- char *(*getenv_function)(char *name, size_t name_len TSRMLS_DC);
- char *(*resolve_path_function)(const char *filename, int filename_len
TSRMLS_DC);
+ zend_str_size_int (*vspprintf_function)(char **pbuf,
zend_str_size_size_t max_len, const char *format, va_list ap);
+ char *(*getenv_function)(char *name, zend_str_size_size_t name_len
TSRMLS_DC);
+ char *(*resolve_path_function)(const char *filename, zend_str_size_int
filename_len TSRMLS_DC);
} zend_utility_functions;
typedef struct _zend_utility_values {
@@@ -699,13 -698,13 +699,13 @@@ extern ZEND_API zend_write_func_t zend_
extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path
TSRMLS_DC);
extern ZEND_API void (*zend_block_interruptions)(void);
extern ZEND_API void (*zend_unblock_interruptions)(void);
- extern ZEND_API void (*zend_ticks_function)(int ticks);
+ extern ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC);
-extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename,
const uint error_lineno, const char *format, va_list args)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
+extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename,
const zend_str_size_uint error_lineno, const char *format, va_list args)
ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
extern ZEND_API void (*zend_on_timeout)(int seconds TSRMLS_DC);
extern ZEND_API int (*zend_stream_open_function)(const char *filename,
zend_file_handle *handle TSRMLS_DC);
-extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format,
va_list ap);
-extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
-extern ZEND_API char *(*zend_resolve_path)(const char *filename, int
filename_len TSRMLS_DC);
+extern zend_str_size_int (*zend_vspprintf)(char **pbuf, zend_str_size_size_t
max_len, const char *format, va_list ap);
+extern ZEND_API char *(*zend_getenv)(char *name, zend_str_size_size_t
name_len TSRMLS_DC);
+extern ZEND_API char *(*zend_resolve_path)(const char *filename,
zend_str_size_int filename_len TSRMLS_DC);
ZEND_API void zend_error(int type, const char *format, ...)
ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
diff --cc Zend/zend_execute.h
index 9811096,4802f0a..5c444f0
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@@ -60,15 -60,15 +60,15 @@@ ZEND_API zend_execute_data *zend_create
ZEND_API void zend_execute(zend_op_array *op_array TSRMLS_DC);
ZEND_API void execute_ex(zend_execute_data *execute_data TSRMLS_DC);
ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, struct
_zend_fcall_info *fci, int return_value_used TSRMLS_DC);
- ZEND_API int zend_is_true(zval *op);
+ ZEND_API int zend_is_true(zval *op TSRMLS_DC);
-ZEND_API int zend_lookup_class(const char *name, int name_length,
zend_class_entry ***ce TSRMLS_DC);
-ZEND_API int zend_lookup_class_ex(const char *name, int name_length, const
zend_literal *key, int use_autoload, zend_class_entry ***ce TSRMLS_DC);
+ZEND_API int zend_lookup_class(const char *name, zend_str_size_int
name_length, zend_class_entry ***ce TSRMLS_DC);
+ZEND_API int zend_lookup_class_ex(const char *name, zend_str_size_int
name_length, const zend_literal *key, int use_autoload, zend_class_entry ***ce
TSRMLS_DC);
ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name
TSRMLS_DC);
-ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char
*string_name TSRMLS_DC);
+ZEND_API int zend_eval_stringl(char *str, zend_str_size_int str_len, zval
*retval_ptr, char *string_name TSRMLS_DC);
ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char
*string_name, int handle_exceptions TSRMLS_DC);
-ZEND_API int zend_eval_stringl_ex(char *str, int str_len, zval *retval_ptr,
char *string_name, int handle_exceptions TSRMLS_DC);
+ZEND_API int zend_eval_stringl_ex(char *str, zend_str_size_int str_len, zval
*retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
-ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info,
ulong fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC);
+ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info,
zend_uint_t fetch_type, const char **class_name, zend_class_entry **pce
TSRMLS_DC);
ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf,
zend_uint arg_num, const char *need_msg, const char *need_kind, const char
*given_msg, const char *given_kind TSRMLS_DC);
static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr
ZEND_FILE_LINE_DC TSRMLS_DC)
diff --cc Zend/zend_vm_execute.h
index 3ca3adc,24d6aad..252dff1
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -1293,9 -1293,9 +1293,8 @@@ static int ZEND_FASTCALL ZEND_INIT_FCA
ZEND_VM_NEXT_OPCODE();
} else {
char *function_name_strval, *lcname;
- int function_name_strlen;
-
+ zend_str_size_int function_name_strlen;
-
SAVE_OPLINE();
function_name = opline->op2.zv;
@@@ -2029,9 -2029,9 +2028,8 @@@ static int ZEND_FASTCALL ZEND_INIT_FCA
ZEND_VM_NEXT_OPCODE();
} else {
char *function_name_strval, *lcname;
- int function_name_strlen;
+ zend_str_size_int function_name_strlen;
-
-
+
-
SAVE_OPLINE();
function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data,
opline->op2.var TSRMLS_CC);
@@@ -3449,10 -3449,10 +3447,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_CONST == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -3640,12 -3640,12 +3638,11 @@@ static int ZEND_FASTCALL ZEND_INIT_STA
/* do nothing */
} else if (IS_CONST != IS_UNUSED) {
char *function_name_strval = NULL;
- int function_name_strlen = 0;
-
+ zend_str_size_int function_name_strlen = 0;
-
if (IS_CONST == IS_CONST) {
function_name_strval = Z_STRVAL_P(opline->op2.zv);
- function_name_strlen = Z_STRLEN_P(opline->op2.zv);
+ function_name_strlen = Z_STRSIZE_P(opline->op2.zv);
} else {
function_name = opline->op2.zv;
@@@ -3867,9 -3867,9 +3864,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CONST != IS_UNUSED) {
-
+
zval *offset = opline->op2.zv;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -5303,10 -5303,10 +5300,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_CONST == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -6038,10 -6038,10 +6035,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_CONST == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -6188,12 -6188,12 +6185,11 @@@ static int ZEND_FASTCALL ZEND_INIT_STA
/* do nothing */
} else if (IS_UNUSED != IS_UNUSED) {
char *function_name_strval = NULL;
- int function_name_strlen = 0;
-
+ zend_str_size_int function_name_strlen = 0;
-
if (IS_UNUSED == IS_CONST) {
function_name_strval = Z_STRVAL_P(opline->op2.zv);
- function_name_strlen = Z_STRLEN_P(opline->op2.zv);
+ function_name_strlen = Z_STRSIZE_P(opline->op2.zv);
} else {
function_name = NULL;
@@@ -6305,9 -6305,9 +6301,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_UNUSED != IS_UNUSED) {
-
+
zval *offset = NULL;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -7039,12 -7039,12 +7035,11 @@@ static int ZEND_FASTCALL ZEND_INIT_STA
/* do nothing */
} else if (IS_CV != IS_UNUSED) {
char *function_name_strval = NULL;
- int function_name_strlen = 0;
-
+ zend_str_size_int function_name_strlen = 0;
-
if (IS_CV == IS_CONST) {
function_name_strval = Z_STRVAL_P(opline->op2.zv);
- function_name_strlen = Z_STRLEN_P(opline->op2.zv);
+ function_name_strlen = Z_STRSIZE_P(opline->op2.zv);
} else {
function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data,
opline->op2.var TSRMLS_CC);
@@@ -7230,9 -7230,9 +7225,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CV != IS_UNUSED) {
-
+
zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data,
opline->op2.var TSRMLS_CC);
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -8787,10 -8787,10 +8782,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_TMP_VAR == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -9111,9 -9111,9 +9106,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CONST != IS_UNUSED) {
-
+
zval *offset = opline->op2.zv;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -10509,10 -10509,10 +10504,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_TMP_VAR == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -11246,10 -11246,10 +11241,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_TMP_VAR == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -11390,9 -11390,9 +11385,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_UNUSED != IS_UNUSED) {
-
+
zval *offset = NULL;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -12237,9 -12237,9 +12232,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CV != IS_UNUSED) {
-
+
zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data,
opline->op2.var TSRMLS_CC);
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -14645,10 -14645,10 +14640,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_VAR == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -15448,12 -15448,12 +15443,11 @@@ static int ZEND_FASTCALL ZEND_INIT_STA
/* do nothing */
} else if (IS_CONST != IS_UNUSED) {
char *function_name_strval = NULL;
- int function_name_strlen = 0;
-
+ zend_str_size_int function_name_strlen = 0;
-
if (IS_CONST == IS_CONST) {
function_name_strval = Z_STRVAL_P(opline->op2.zv);
- function_name_strlen = Z_STRLEN_P(opline->op2.zv);
+ function_name_strlen = Z_STRSIZE_P(opline->op2.zv);
} else {
function_name = opline->op2.zv;
@@@ -15675,9 -15675,9 +15669,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CONST != IS_UNUSED) {
-
+
zval *offset = opline->op2.zv;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -19197,10 -19197,10 +19191,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_VAR == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -21162,10 -21162,10 +21156,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_VAR == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -21482,12 -21482,12 +21476,11 @@@ static int ZEND_FASTCALL ZEND_INIT_STA
/* do nothing */
} else if (IS_UNUSED != IS_UNUSED) {
char *function_name_strval = NULL;
- int function_name_strlen = 0;
-
+ zend_str_size_int function_name_strlen = 0;
-
if (IS_UNUSED == IS_CONST) {
function_name_strval = Z_STRVAL_P(opline->op2.zv);
- function_name_strlen = Z_STRLEN_P(opline->op2.zv);
+ function_name_strlen = Z_STRSIZE_P(opline->op2.zv);
} else {
function_name = NULL;
@@@ -21599,9 -21599,9 +21592,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_UNUSED != IS_UNUSED) {
-
+
zval *offset = NULL;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -23484,12 -23484,12 +23477,11 @@@ static int ZEND_FASTCALL ZEND_INIT_STA
/* do nothing */
} else if (IS_CV != IS_UNUSED) {
char *function_name_strval = NULL;
- int function_name_strlen = 0;
-
+ zend_str_size_int function_name_strlen = 0;
-
if (IS_CV == IS_CONST) {
function_name_strval = Z_STRVAL_P(opline->op2.zv);
- function_name_strlen = Z_STRLEN_P(opline->op2.zv);
+ function_name_strlen = Z_STRSIZE_P(opline->op2.zv);
} else {
function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data,
opline->op2.var TSRMLS_CC);
@@@ -23615,9 -23615,9 +23607,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CV != IS_UNUSED) {
-
+
zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data,
opline->op2.var TSRMLS_CC);
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -24983,8 -24983,8 +24975,8 @@@ static int ZEND_FASTCALL ZEND_INIT_MET
USE_OPLINE
zval *function_name;
char *function_name_strval;
- int function_name_strlen;
+ zend_str_size_int function_name_strlen;
-
+
call_slot *call = EX(call_slots) + opline->result.num;
SAVE_OPLINE();
@@@ -25170,10 -25170,10 +25162,10 @@@ static int ZEND_FASTCALL ZEND_INIT_ARR
static int ZEND_FASTCALL
ZEND_UNSET_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
-
+
zval **container;
zval *offset;
- ulong hval;
+ zend_uint_t hval;
SAVE_OPLINE();
container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
@@@ -29422,8 -29422,8 +29414,8 @@@ static int ZEND_FASTCALL ZEND_INIT_MET
USE_OPLINE
zval *function_name;
char *function_name_strval;
- int function_name_strlen;
+ zend_str_size_int function_name_strlen;
-
+
call_slot *call = EX(call_slots) + opline->result.num;
SAVE_OPLINE();
@@@ -29513,10 -29513,10 +29505,10 @@@ static int ZEND_FASTCALL ZEND_INIT_ARR
static int ZEND_FASTCALL
ZEND_UNSET_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
-
+
zval **container;
zval *offset;
- ulong hval;
+ zend_uint_t hval;
SAVE_OPLINE();
container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
@@@ -31974,10 -31974,10 +31966,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_CV == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -32651,8 -32651,8 +32643,8 @@@ static int ZEND_FASTCALL ZEND_INIT_MET
USE_OPLINE
zval *function_name;
char *function_name_strval;
- int function_name_strlen;
+ zend_str_size_int function_name_strlen;
-
+
call_slot *call = EX(call_slots) + opline->result.num;
SAVE_OPLINE();
@@@ -32777,9 -32777,9 +32769,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CONST != IS_UNUSED) {
-
+
zval *offset = opline->op2.zv;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -32915,10 -32915,10 +32907,10 @@@ static int ZEND_FASTCALL ZEND_UNSET_VA
static int ZEND_FASTCALL
ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
-
+
zval **container;
zval *offset;
- ulong hval;
+ zend_uint_t hval;
SAVE_OPLINE();
container = _get_zval_ptr_ptr_cv_BP_VAR_UNSET(execute_data,
opline->op1.var TSRMLS_CC);
@@@ -36156,10 -36156,10 +36148,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_CV == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -37983,10 -37983,10 +37975,10 @@@ static int ZEND_FASTCALL zend_fetch_var
if (IS_CV == IS_CONST) {
hash_value = Z_HASH_P(varname);
} else {
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
- hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRLEN_P(varname));
++ hash_value = str_hash(Z_STRVAL_P(varname),
Z_STRSIZE_P(varname));
}
- if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
+ if (zend_hash_quick_find(target_symbol_table,
Z_STRVAL_P(varname), Z_STRSIZE_P(varname)+1, hash_value, (void **) &retval) ==
FAILURE) {
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
@@@ -38296,9 -38296,9 +38288,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_UNUSED != IS_UNUSED) {
-
+
zval *offset = NULL;
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -40031,8 -40031,8 +40023,8 @@@ static int ZEND_FASTCALL ZEND_INIT_MET
USE_OPLINE
zval *function_name;
char *function_name_strval;
- int function_name_strlen;
+ zend_str_size_int function_name_strlen;
-
+
call_slot *call = EX(call_slots) + opline->result.num;
SAVE_OPLINE();
@@@ -40157,9 -40157,9 +40149,9 @@@ static int ZEND_FASTCALL ZEND_ADD_ARRA
}
if (IS_CV != IS_UNUSED) {
-
+
zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data,
opline->op2.var TSRMLS_CC);
- ulong hval;
+ zend_uint_t hval;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
@@@ -40217,10 -40217,10 +40209,10 @@@ static int ZEND_FASTCALL ZEND_INIT_ARR
static int ZEND_FASTCALL
ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
USE_OPLINE
-
+
zval **container;
zval *offset;
- ulong hval;
+ zend_uint_t hval;
SAVE_OPLINE();
container = _get_zval_ptr_ptr_cv_BP_VAR_UNSET(execute_data,
opline->op1.var TSRMLS_CC);
diff --cc main/SAPI.h
index ff9ff83,3097cf1..dea3804
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@@ -226,9 -226,9 +226,9 @@@ struct _sapi_module_struct
int (*activate)(TSRMLS_D);
int (*deactivate)(TSRMLS_D);
- int (*ub_write)(const char *str, unsigned int str_length TSRMLS_DC);
+ zend_str_size_int (*ub_write)(const char *str, zend_str_size_uint
str_length TSRMLS_DC);
- void (*flush)(void *server_context);
+ void (*flush)(void *server_context TSRMLS_DC);
- struct stat *(*get_stat)(TSRMLS_D);
+ zend_stat_t *(*get_stat)(TSRMLS_D);
char *(*getenv)(char *name, size_t name_len TSRMLS_DC);
void (*sapi_error)(int type, const char *error_msg, ...);
diff --cc main/php_ini.c
index 0ae4b37,2bdd3ae..e60311b
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@@ -359,10 -358,10 +359,10 @@@ static void php_load_php_extension_cb(v
static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
{
char *filename = *((char **) arg);
- int length = strlen(filename);
+ zend_str_size length = strlen(filename);
if (IS_ABSOLUTE_PATH(filename, length)) {
- zend_load_extension(filename);
+ zend_load_extension(filename TSRMLS_CC);
} else {
char *libpath;
char *extension_dir = INI_STR("extension_dir");--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
