svn: /php/php-src/branches/PHP_5_2/ NEWS ext/gmp/gmp.c

iliaa Fri, 27 Nov 2009 03:13:59 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291336 Log: Revert gmp patches as they require a newer lib Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/gmp/gmp.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-11-27 03:02:01 UTC (rev 291335) +++ php/php-src/branches/PHP_5_2/NEWS 2009-11-27 03:13:59 UTC (rev 291336) @@ -3,8 +3,6 @@ ?? Nov 2009, PHP 5.2.12RC2 - Updated timezone database to version 2009.19 (2009s). (Derick) -- Changed gmp_strval() to use full range from 2 to 62, and -2 to -36. FR #50283 - (David Soria Parra) - Changed "post_max_size" php.ini directive to allow unlimited post size by setting it to 0. (Rasmus) Modified: php/php-src/branches/PHP_5_2/ext/gmp/gmp.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/gmp/gmp.c 2009-11-27 03:02:01 UTC (rev 291335) +++ php/php-src/branches/PHP_5_2/ext/gmp/gmp.c 2009-11-27 03:13:59 UTC (rev 291336) @@ -753,9 +753,9 @@ } if (argc == 2) { - convert_to_long_ex(base_arg); - base = Z_LVAL_PP(base_arg); - if (base < 2 || base > 62) { + convert_to_long_ex(base_arg); + base = Z_LVAL_PP(base_arg); + if (base < 2 || base > 36) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %d (should be between 2 and 36)", base); RETURN_FALSE; } @@ -817,12 +817,12 @@ break; } - if ((base < 2 && base > -2) || base > 62 || base < -36) { + if (base < 2 || base > 36) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %d", base); RETURN_FALSE; } - num_len = mpz_sizeinbase(*gmpnum, abs(base)); + num_len = mpz_sizeinbase(*gmpnum, base); out_string = emalloc(num_len+2); if (mpz_sgn(*gmpnum) < 0) { num_len++;