diff options
Diffstat (limited to 'lang/php5/files')
| -rw-r--r-- | lang/php5/files/patch-configure | 130 | ||||
| -rw-r--r-- | lang/php5/files/patch-ext::gd::gd_ctx.c | 42 | ||||
| -rw-r--r-- | lang/php5/files/patch-main::main.c | 139 |
3 files changed, 130 insertions, 181 deletions
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure index 9a84d05c3f1c..10b9fafe78b9 100644 --- a/lang/php5/files/patch-configure +++ b/lang/php5/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Jun 19 00:06:29 2003 -+++ configure Sat Jun 28 16:45:44 2003 -@@ -597,6 +597,8 @@ +--- configure.orig Tue Jul 15 00:32:50 2003 ++++ configure Tue Jul 15 01:44:37 2003 +@@ -620,6 +620,8 @@ ac_help="$ac_help --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support." ac_help="$ac_help @@ -9,7 +9,7 @@ --with-gettext[=DIR] Include GNU gettext support." ac_help="$ac_help --with-gmp Include GNU MP support" -@@ -28224,6 +28226,31 @@ +@@ -29376,6 +29378,31 @@ @@ -41,7 +41,7 @@ -@@ -28248,7 +28275,7 @@ +@@ -29528,7 +29555,7 @@ libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \ libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \ libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \ @@ -50,7 +50,7 @@ libgd/xbm.c" for ac_func in fabsf floorf -@@ -28323,6 +28350,11 @@ +@@ -29603,6 +29630,11 @@ fi @@ -62,7 +62,7 @@ if test "$PHP_JPEG_DIR" != "no"; then for i in /usr /usr/local $PHP_JPEG_DIR; do -@@ -29724,6 +29756,9 @@ +@@ -31314,6 +31346,9 @@ cat >> confdefs.h <<\EOF #define HAVE_GD_BUNDLED 1 @@ -72,7 +72,7 @@ EOF cat >> confdefs.h <<\EOF -@@ -29774,6 +29809,14 @@ +@@ -31364,6 +31399,14 @@ GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi @@ -87,10 +87,10 @@ else if test "$PHP_GD" != "no"; then -@@ -32275,6 +32318,60 @@ - - save_old_LDFLAGS=$LDFLAGS - LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS" +@@ -35713,6 +35756,137 @@ + esac + done + + echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6 +echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5 +ac_lib_var=`echo gd'_'gdImageGifAnimBegin | sed 'y%./+-%__p_%'` @@ -126,32 +126,109 @@ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ ++ + LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF +#define HAVE_GD_GIF_ANIM 1 +EOF + -+ ++ +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + unset ac_cv_func_gd -+ -+ ++ ++ +fi + -+ ++ + save_old_LDFLAGS=$LDFLAGS -+ LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS" ++ ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -l$ac_ii" ++ else ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" ++ else ++ ++ ++ ++ unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "LIBPATH$unique=set" ++ ++ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" ++ LDFLAGS="$LDFLAGS -L$ai_p" ++ PHP_RPATHS="$PHP_RPATHS $ai_p" ++ ++ fi ++ ++ ++ fi ++ ++ fi ++ ++ ;; ++ esac ++ done ++ echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 - echo "configure:32280: checking for gdCacheCreate in -lgd" >&5 + echo "configure:35718: checking for gdCacheCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` -@@ -54325,8 +54422,8 @@ +@@ -57066,8 +57240,8 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 - echo "configure:54328: checking Oracle version" >&5 + echo "configure:57069: checking Oracle version" >&5 - if test -s "$ORACLE_DIR/orainst/unix.rgs"; then - ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` + if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then @@ -159,7 +236,7 @@ test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then ORACLE_VERSION=9.0 -@@ -56589,6 +56686,102 @@ +@@ -58359,6 +58533,102 @@ if test "$ext_shared" = "yes"; then @@ -262,7 +339,7 @@ ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD" if test -n "$ORACLE_DIR/lib"; then -@@ -71130,29 +71323,6 @@ +@@ -77889,29 +78159,6 @@ else @@ -292,7 +369,7 @@ case ct in c|c_r|pthread*) ;; *) -@@ -71176,52 +71346,7 @@ +@@ -77935,52 +78182,7 @@ @@ -346,7 +423,7 @@ save_old_LDFLAGS=$LDFLAGS -@@ -71291,37 +71416,6 @@ +@@ -78126,38 +78328,6 @@ @@ -354,6 +431,7 @@ - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared - unset ac_cv_func_tcl - - @@ -384,7 +462,7 @@ fi -@@ -84252,10 +84346,7 @@ +@@ -89822,10 +89992,7 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag" all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' diff --git a/lang/php5/files/patch-ext::gd::gd_ctx.c b/lang/php5/files/patch-ext::gd::gd_ctx.c index 14ce90f1a83c..fa2e4453fd81 100644 --- a/lang/php5/files/patch-ext::gd::gd_ctx.c +++ b/lang/php5/files/patch-ext::gd::gd_ctx.c @@ -1,7 +1,7 @@ ---- ext/gd/gd_ctx.c.orig Wed Mar 12 05:16:31 2003 -+++ ext/gd/gd_ctx.c Sat Jun 28 15:47:56 2003 -@@ -24,17 +24,22 @@ - +--- ext/gd/gd_ctx.c.orig Mon Jun 23 20:07:47 2003 ++++ ext/gd/gd_ctx.c Tue Jul 15 01:54:58 2003 +@@ -44,23 +44,29 @@ + /* {{{ _php_image_output_ctx */ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)()) { - zval **imgind, **file, **quality; @@ -16,27 +16,34 @@ +#endif /* HAVE_GD_GIF_ANIM */ gdIOCtx *ctx; - /* The quality parameter for Wbmp stands for the threshold when called from image2wbmp() */ -+ /* The quality parameter for GIF animation stands for colormap inclusion. 1==include local/global colormap */ -+ /* The LeftOfs parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension. */ + /* The third (quality) parameter for Wbmp stands for the threshold when called from image2wbmp(). + * The third (quality) parameter for Wbmp and Xbm stands for the foreground color index when called + * from imagey<type>(). ++ * The third (quality) parameter for GIF animation stands for colormap inclusion. 1==include ++ * local/global colormap. ++ * The fourth (LeftOfs) parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension. + */ + if (argc < 2 && image_type == PHP_GDIMG_TYPE_XBM) { + WRONG_PARAM_COUNT; + } - if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE) -+ if (argc < 1 || argc > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE) ++ if (argc < 1 || argc > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE) { WRONG_PARAM_COUNT; } -@@ -44,11 +49,29 @@ +@@ -70,11 +76,29 @@ if (argc > 1) { convert_to_string_ex(file); fn = Z_STRVAL_PP(file); - if (argc == 3) { - convert_to_long_ex(quality); -- q = Z_LVAL_PP(quality); +- q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */ - } } + if (argc >= 3) { + convert_to_long_ex(quality); -+ q = Z_LVAL_PP(quality); ++ q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */ + } +#ifdef HAVE_GD_GIF_ANIM + if (argc >= 4) { @@ -59,7 +66,7 @@ if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) { if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) { -@@ -56,7 +79,7 @@ +@@ -82,7 +106,7 @@ RETURN_FALSE; } @@ -68,9 +75,9 @@ if (!fp) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn); RETURN_FALSE; -@@ -94,6 +117,14 @@ - } - (*func_p)(im, i, ctx); +@@ -128,6 +152,14 @@ + (*func_p)(im, q, ctx); + } break; +#ifdef HAVE_GD_GIF_ANIM + case PHP_GDIMG_TYPE_GIFANIMBEGIN: @@ -83,7 +90,7 @@ default: (*func_p)(im, ctx); break; -@@ -112,3 +143,72 @@ +@@ -146,6 +178,75 @@ RETURN_TRUE; } @@ -156,3 +163,6 @@ +} +/* }}} */ +#endif /* HAVE_GD_GIF_ANIM */ + /* }}} */ + + /* diff --git a/lang/php5/files/patch-main::main.c b/lang/php5/files/patch-main::main.c deleted file mode 100644 index 4ed09ae69f5d..000000000000 --- a/lang/php5/files/patch-main::main.c +++ /dev/null @@ -1,139 +0,0 @@ ---- main/main.c.orig Sun Jun 22 11:16:39 2003 -+++ main/main.c Sun Jun 22 11:17:00 2003 - -@@ -134,7 +134,6 @@ static int short_track_vars_names_length - - #define NUM_TRACK_VARS (sizeof(short_track_vars_names_length)/sizeof(int)) - -- - #define SAFE_FILENAME(f) ((f)?(f):"-") - - /* {{{ PHP_INI_MH -@@ -1362,7 +1361,7 @@ static void php_autoglobal_merge(HashTab - static int php_hash_environment(TSRMLS_D) - { - char *p; -- unsigned char _gpc_flags[3] = {0, 0, 0}; -+ int _gpc_flags[5] = {0, 0, 0, 0, 0}; - zend_bool have_variables_order; - zval *dummy_track_vars_array = NULL; - zend_bool initialized_dummy_track_vars_array=0; -@@ -1409,42 +1408,48 @@ static int php_hash_environment(TSRMLS_D - case 'P': - if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcmp(SG(request_info).request_method, "POST")) { - sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */ -- _gpc_flags[0]=1; -+ _gpc_flags[0]=TRACK_VARS_POST + 1; - } - break; - case 'c': - case 'C': - if (!_gpc_flags[1]) { - sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */ -- _gpc_flags[1]=1; -+ _gpc_flags[1]=TRACK_VARS_COOKIE + 1; - } - break; - case 'g': - case 'G': - if (!_gpc_flags[2]) { - sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */ -- _gpc_flags[2]=1; -+ _gpc_flags[2]=TRACK_VARS_GET + 1; - } - break; - case 'e': - case 'E': -- if (have_variables_order) { -- ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]); -- array_init(PG(http_globals)[TRACK_VARS_ENV]); -- INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]); -- php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead"); -+ if (!_gpc_flags[3]) { -+ if (have_variables_order) { -+ ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]); -+ array_init(PG(http_globals)[TRACK_VARS_ENV]); -+ INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]); -+ php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC); -+ } else { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead"); -+ } -+ _gpc_flags[3]=TRACK_VARS_ENV + 1; - } - break; - case 's': - case 'S': -- php_register_server_variables(TSRMLS_C); -+ if (!_gpc_flags[4]) { -+ php_register_server_variables(TSRMLS_C); -+ _gpc_flags[4]=TRACK_VARS_SERVER + 1; -+ } - break; - } - } - -- if (!have_variables_order) { -+ if (!have_variables_order && !PG(http_globals)[TRACK_VARS_SERVER]) { - php_register_server_variables(TSRMLS_C); - } - -@@ -1453,6 +1458,14 @@ static int php_hash_environment(TSRMLS_D - php_build_argv(SG(request_info).query_string TSRMLS_CC); - } - -+ if (PG(register_globals)) { -+ for (i = 0; i < 5; i++) { -+ if (PG(http_globals)[i]) { -+ php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[i]) TSRMLS_CC); -+ } -+ } -+ } -+ - for (i=0; i<NUM_TRACK_VARS; i++) { - if (!PG(http_globals)[i]) { - if (!initialized_dummy_track_vars_array) { -@@ -1478,39 +1491,12 @@ static int php_hash_environment(TSRMLS_D - array_init(form_variables); - INIT_PZVAL(form_variables); - -- for (p=variables_order; p && *p; p++) { -- switch (*p) { -- case 'g': -- case 'G': -- php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC); -- break; -- case 'p': -- case 'P': -- php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC); -- break; -- case 'c': -- case 'C': -- php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC); -- break; -- } -- } -- -- if (PG(register_globals)) { -- HashPosition pos; -- zval **data; -- char *string_key; -- uint string_key_len; -- ulong num_key; -- -- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(form_variables), &pos); -- while (zend_hash_get_current_data_ex(Z_ARRVAL_P(form_variables), (void **)&data, &pos) == SUCCESS) { -- /* we only register string keys, since we cannot have $1234 */ -- if (zend_hash_get_current_key_ex(Z_ARRVAL_P(form_variables), &string_key, &string_key_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) { -- ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), string_key, string_key_len, *data, (*data)->refcount+1, 0); -- } -- zend_hash_move_forward_ex(Z_ARRVAL_P(form_variables), &pos); -+ for (i = 0; i < 3; i++) { -+ if (_gpc_flags[i]) { -+ php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[(_gpc_flags[i] - 1)]) TSRMLS_CC); - } - } -+ - zend_hash_update(&EG(symbol_table), "_REQUEST", sizeof("_REQUEST"), &form_variables, sizeof(zval *), NULL); - } |