diff options
Diffstat (limited to 'dev-lang/php/files')
5 files changed, 22 insertions, 44 deletions
diff --git a/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch b/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch index d3eb55c5ee3e..fea8c7a1ec50 100644 --- a/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch +++ b/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch @@ -249,17 +249,6 @@ #if HAVE_ARPA_INET_H # include <arpa/inet.h> -@@ -813,8 +802,8 @@ - PHP_FE(prev, first_arg_force_ref) - PHP_FE(next, first_arg_force_ref) - PHP_FE(reset, first_arg_force_ref) -- PHP_FE(current, first_arg_force_ref) -- PHP_FE(key, first_arg_force_ref) -+ PHP_FE(current, NULL) -+ PHP_FE(key, NULL) - PHP_FE(min, NULL) - PHP_FE(max, NULL) - PHP_FE(in_array, NULL) @@ -944,6 +933,13 @@ static void php_putenv_destructor(putenv_entry *pe) { diff --git a/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch b/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch index 3aefaee16295..3b13cd71966c 100644 --- a/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch +++ b/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch @@ -192,17 +192,6 @@ #if HAVE_ARPA_INET_H # include <arpa/inet.h> -@@ -813,8 +802,8 @@ - PHP_FE(prev, first_arg_force_ref) - PHP_FE(next, first_arg_force_ref) - PHP_FE(reset, first_arg_force_ref) -- PHP_FE(current, first_arg_force_ref) -- PHP_FE(key, first_arg_force_ref) -+ PHP_FE(current, NULL) -+ PHP_FE(key, NULL) - PHP_FE(min, NULL) - PHP_FE(max, NULL) - PHP_FE(in_array, NULL) @@ -3038,11 +3027,25 @@ prefix = va_arg(args, char *); prefix_len = va_arg(args, uint); diff --git a/dev-lang/php/files/4.4.1/php4.4.1-current_key_by_reference.patch b/dev-lang/php/files/4.4.1/php4.4.1-current_key_by_reference.patch new file mode 100644 index 000000000000..cf3754dc3ca7 --- /dev/null +++ b/dev-lang/php/files/4.4.1/php4.4.1-current_key_by_reference.patch @@ -0,0 +1,22 @@ +--- ext/standard/basic_functions.c 2005/09/29 16:31:48 1.543.2.51.2.3 ++++ ext/standard/basic_functions.c 2005/11/02 17:58:00 1.543.2.51.2.4 +@@ -17,7 +17,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: basic_functions.c,v 1.543.2.51.2.3 2005/09/29 16:31:48 iliaa Exp $ */ ++/* $Id: basic_functions.c,v 1.543.2.51.2.4 2005/11/02 17:58:00 iliaa Exp $ */ + + #include "php.h" + #include "php_streams.h" +@@ -802,8 +802,8 @@ function_entry basic_functions[] = { + PHP_FE(prev, first_arg_force_ref) + PHP_FE(next, first_arg_force_ref) + PHP_FE(reset, first_arg_force_ref) +- PHP_FE(current, NULL) +- PHP_FE(key, NULL) ++ PHP_FE(current, first_arg_force_ref) ++ PHP_FE(key, first_arg_force_ref) + PHP_FE(min, NULL) + PHP_FE(max, NULL) + PHP_FE(in_array, NULL) diff --git a/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch b/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch index 02a9a83eff0c..426273bb7575 100644 --- a/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch +++ b/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch @@ -553,17 +553,6 @@ PHP_FE(ini_get, NULL) PHP_FE(ini_get_all, NULL) -@@ -743,8 +743,8 @@ - PHP_FE(prev, first_arg_force_ref) - PHP_FE(next, first_arg_force_ref) - PHP_FE(reset, first_arg_force_ref) -- PHP_FE(current, first_arg_force_ref) -- PHP_FE(key, first_arg_force_ref) -+ PHP_FE(current, NULL) -+ PHP_FE(key, NULL) - PHP_FE(min, NULL) - PHP_FE(max, NULL) - PHP_FE(in_array, NULL) @@ -930,7 +930,6 @@ BG(user_tick_functions) = NULL; BG(user_filter_map) = NULL; diff --git a/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch b/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch index cdae541d5eef..20cedc94c588 100644 --- a/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch +++ b/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch @@ -92,17 +92,6 @@ #include "php.h" #include "php_streams.h" -@@ -742,8 +743,8 @@ - PHP_FE(prev, first_arg_force_ref) - PHP_FE(next, first_arg_force_ref) - PHP_FE(reset, first_arg_force_ref) -- PHP_FE(current, first_arg_force_ref) -- PHP_FE(key, first_arg_force_ref) -+ PHP_FE(current, NULL) -+ PHP_FE(key, NULL) - PHP_FE(min, NULL) - PHP_FE(max, NULL) - PHP_FE(in_array, NULL) @@ -3076,11 +3077,25 @@ prefix = va_arg(args, char *); prefix_len = va_arg(args, uint); |