[PHP-CVS] cvs: php-src /ext/oci8 php_oci8_int.h
tony2001Mon Jul 9 09:08:52 2007 UTC Modified files: /php-src/ext/oci8 php_oci8_int.h Log: use correct types for scale and precision http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.34r2=1.35diff_format=u Index: php-src/ext/oci8/php_oci8_int.h diff -u php-src/ext/oci8/php_oci8_int.h:1.34 php-src/ext/oci8/php_oci8_int.h:1.35 --- php-src/ext/oci8/php_oci8_int.h:1.34Thu Mar 29 09:30:25 2007 +++ php-src/ext/oci8/php_oci8_int.h Mon Jul 9 09:08:52 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: php_oci8_int.h,v 1.34 2007/03/29 09:30:25 tony2001 Exp $ */ +/* $Id: php_oci8_int.h,v 1.35 2007/07/09 09:08:52 tony2001 Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_INT_H @@ -224,8 +224,8 @@ php_oci_define *define; /* define handle */ int piecewise; /* column is fetched piece-by-piece */ ub4 cb_retlen; /* */ - ub2 scale; /* column scale */ - ub2 precision; /* column precision */ + sb1 scale; /* column scale */ + sb2 precision; /* column precision */ ub1 charset_form; /* charset form, required for NCLOBs */ ub2 charset_id; /* charset ID */ } php_oci_out_column; /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 php_oci8_int.h
tony2001Mon Jul 9 09:08:59 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 php_oci8_int.h Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.11.2.6.2.18r2=1.11.2.6.2.19diff_format=u Index: php-src/ext/oci8/php_oci8_int.h diff -u php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.18 php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.19 --- php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.18 Thu Mar 29 09:33:03 2007 +++ php-src/ext/oci8/php_oci8_int.h Mon Jul 9 09:08:59 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: php_oci8_int.h,v 1.11.2.6.2.18 2007/03/29 09:33:03 tony2001 Exp $ */ +/* $Id: php_oci8_int.h,v 1.11.2.6.2.19 2007/07/09 09:08:59 tony2001 Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_INT_H @@ -215,8 +215,8 @@ php_oci_define *define; /* define handle */ int piecewise; /* column is fetched piece-by-piece */ ub4 cb_retlen; /* */ - ub2 scale; /* column scale */ - ub2 precision; /* column precision */ + sb1 scale; /* column scale */ + sb2 precision; /* column precision */ ub1 charset_form; /* charset form, required for NCLOBs */ ub2 charset_id; /* charset ID */ } php_oci_out_column; /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
janiMon Jul 9 10:17:52 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: fix news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.820r2=1.2027.2.547.2.821diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.820 php-src/NEWS:1.2027.2.547.2.821 --- php-src/NEWS:1.2027.2.547.2.820 Sun Jul 8 15:28:46 2007 +++ php-src/NEWSMon Jul 9 10:17:51 2007 @@ -14,15 +14,15 @@ - Changed error handler to send HTTP 500 instead of blank page on PHP errors. (Dmitry, Andrei Nigmatulin) -- Added persistent connection status checker to pdo_pgsql (Elvis - Pranskevichus, Ilia) +- Added persistent connection status checker to pdo_pgsql. + (Elvis Pranskevichus, Ilia) - Added support for ATTR_TIMEOUT inside pdo_pgsql driver. (Ilia) - Added php_ini_loaded_file() function which returns the path to the actual php.ini in use. (Jani) - Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING. (Pierre) -- Added missing open_basedir checks to CGI. (anight at eyelinkmedia dot com, - Tony) +- Added missing open_basedir checks to CGI. + (anight at eyelinkmedia dot com, Tony) - Added missing format validator to unpack() function. (Ilia) - Added missing error check inside bcpowmod(). (Ilia) - Added CURLOPT_PRIVATE CURLINFO_PRIVATE constants. @@ -30,7 +30,7 @@ - Fixed var_export() to use the new H modifier so that it can generate parseable PHP code for floats, independent of the locale. (Derick) -- Fixed regression introduced by the fix for the libgd bug #74 (Pierre) +- Fixed regression introduced by the fix for the libgd bug #74. (Pierre) - Fixed several integer overflows in ImageCreate(), ImageCreateTrueColor(), ImageCopyResampled() and ImageFilledPolygon() reported by Mattias Bengtsson. (Tony) @@ -43,21 +43,21 @@ when open_basedir or safe_mode is active. (Stas) - Fixed SimpleXML's behavior when used with empty(). (Sara) -- Fixed PECL Bug #11345 (PDO_OCI crash after National language Support - NLS environment initialization error) (Chris Jones) +- Fixed PECL Bug #11345 (PDO_OCI crash after National language Support NLS + environment initialization error). (Chris Jones) - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory already exists). (Pierre) -- Fixed bug #41919 (crash in string to array conversion). (judas dot - iscariote at gmail dot com, Ilia) +- Fixed bug #41919 (crash in string to array conversion). + (judas dot iscariote at gmail dot com, Ilia) - Fixed bug #41908 (CFLAGS=-Os ./configure --enable-debug fails). (christian at hoffie dot info, Tony) - Fixed bug #41909 (var_export() is locale sensitive when exporting float values). (Derick) -- Fixed bug #41867 (getName is broken). (Rob) +- Fixed bug #41867 (SimpleXML: getName is broken). (Rob) - Fixed bug #41865 (fputcsv(): 2nd parameter is not optional). (Jani) -- Fixed bug #41861 (getNamespaces() returns the namespaces of a node's - siblings). (Rob) +- Fixed bug #41861 (SimpleXML: getNamespaces() returns the namespaces of + a node's siblings). (Rob) - Fixed bug #41845 (pgsql extension does not compile with PostgreSQL 7.4). (Ilia) - Fixed bug #41813 (segmentation fault when using string offset as an object). @@ -100,13 +100,13 @@ - Fixed bug #41594 (OCI8 statement cache is flushed too frequently). (Tony) - Fixed bug #41582 (SimpleXML crashes when accessing newly created element). (Tony) -- Fixed bug #41576 (configure failure when using --without-apxs or some - other SAPIs disabling options). (Jani) -- Fixed bug #41567 (json_encode() double conversion is inconsistent with - PHP). (Lucas, Ilia) +- Fixed bug #41576 (configure failure when using --without-apxs or some other + SAPIs disabling options). (Jani) +- Fixed bug #41567 (json_encode() double conversion is inconsistent with PHP). + (Lucas, Ilia) - Fixed bug #41566 (SOAP Server not properly generating href attributes). (Dmitry) -- Fixed bug #41561 (Values set with php_admin_* in httpd.conf can be overwritten +- Fixed bug #41561 (php_admin_* values set in httpd.conf can be overwritten with ini_set()). (Tony, Dmitry) - Fixed bug #41555 (configure failure: regression caused by fix for #41265). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_odbc config.m4
janiMon Jul 9 11:13:38 2007 UTC Modified files: /php-src/ext/pdo_odbc config.m4 Log: - Fixed bug #41870 (PDO_ODBC module linking fails with iODBC) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.m4?r1=1.22r2=1.23diff_format=u Index: php-src/ext/pdo_odbc/config.m4 diff -u php-src/ext/pdo_odbc/config.m4:1.22 php-src/ext/pdo_odbc/config.m4:1.23 --- php-src/ext/pdo_odbc/config.m4:1.22 Wed Jul 27 03:22:02 2005 +++ php-src/ext/pdo_odbc/config.m4 Mon Jul 9 11:13:38 2007 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.22 2005/07/27 03:22:02 wez Exp $ +dnl $Id: config.m4,v 1.23 2007/07/09 11:13:38 jani Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: @@ -89,7 +89,7 @@ pdo_odbc_def_lib=`echo $PHP_PDO_ODBC | cut -d, -f3` pdo_odbc_def_ldflags=`echo $PHP_PDO_ODBC | cut -d, -f4` pdo_odbc_def_cflags=`echo $PHP_PDO_ODBC | cut -d, -f5` -pdo_odbc_flavour=$pdo_odbc_flavour ($pdo_odbc_def_lib) +pdo_odbc_flavour=generic-$pdo_odbc_def_lib ;; *) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_odbc config.m4
janiMon Jul 9 11:13:56 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_odbc config.m4 Log: MFH: Fixed bug #41870 (PDO_ODBC module linking fails with iODBC) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.m4?r1=1.22.2.1r2=1.22.2.1.2.1diff_format=u Index: php-src/ext/pdo_odbc/config.m4 diff -u php-src/ext/pdo_odbc/config.m4:1.22.2.1 php-src/ext/pdo_odbc/config.m4:1.22.2.1.2.1 --- php-src/ext/pdo_odbc/config.m4:1.22.2.1 Sun Apr 30 01:42:53 2006 +++ php-src/ext/pdo_odbc/config.m4 Mon Jul 9 11:13:56 2007 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.22.2.1 2006/04/30 01:42:53 wez Exp $ +dnl $Id: config.m4,v 1.22.2.1.2.1 2007/07/09 11:13:56 jani Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: @@ -89,7 +89,7 @@ pdo_odbc_def_lib=`echo $PHP_PDO_ODBC | cut -d, -f3` pdo_odbc_def_ldflags=`echo $PHP_PDO_ODBC | cut -d, -f4` pdo_odbc_def_cflags=`echo $PHP_PDO_ODBC | cut -d, -f5` -pdo_odbc_flavour=$pdo_odbc_flavour ($pdo_odbc_def_lib) +pdo_odbc_flavour=generic-$pdo_odbc_def_lib ;; *) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/math bug30695.phpt /ext/standard/tests/strings bug40704.phpt md5.phpt md5_file.phpt substr.phpt trim1.phpt
dmitry Mon Jul 9 11:38:34 2007 UTC Modified files: /php-src/ext/standard/tests/mathbug30695.phpt /php-src/ext/standard/tests/strings bug40704.phpt md5.phpt md5_file.phpt substr.phpt trim1.phpt Log: Fixed tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug30695.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/math/bug30695.phpt diff -u php-src/ext/standard/tests/math/bug30695.phpt:1.1 php-src/ext/standard/tests/math/bug30695.phpt:1.2 --- php-src/ext/standard/tests/math/bug30695.phpt:1.1 Mon Nov 29 10:15:03 2004 +++ php-src/ext/standard/tests/math/bug30695.phpt Mon Jul 9 11:38:34 2007 @@ -1,5 +1,7 @@ --TEST-- Bug #30695 (32 bit issues) +--INI-- +unicode.output_encoding=ISO-8859-1 --FILE-- ?php function toUTF8( $char_code ) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40704.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/bug40704.phpt diff -u php-src/ext/standard/tests/strings/bug40704.phpt:1.2 php-src/ext/standard/tests/strings/bug40704.phpt:1.3 --- php-src/ext/standard/tests/strings/bug40704.phpt:1.2Tue May 29 20:11:23 2007 +++ php-src/ext/standard/tests/strings/bug40704.phptMon Jul 9 11:38:34 2007 @@ -11,3 +11,6 @@ --EXPECT-- string(26) Bug ' Trigger Missing Text Done +--UEXPECT-- +unicode(26) Bug ' Trigger Missing Text +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/md5.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/md5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/md5_file.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/md5_file.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/substr.phpt diff -u php-src/ext/standard/tests/strings/substr.phpt:1.2 php-src/ext/standard/tests/strings/substr.phpt:1.3 --- php-src/ext/standard/tests/strings/substr.phpt:1.2 Sat May 12 12:12:26 2007 +++ php-src/ext/standard/tests/strings/substr.phpt Mon Jul 9 11:38:34 2007 @@ -1,5 +1,8 @@ --TEST-- Testing substr() function +--INI-- +unicode.script_encoding=ISO-8859-1 +unicode.output_encoding=ISO-8859-1 --FILE-- ?php @@ -216,3 +219,143 @@ string(26) ñtërnâtiônà lizætiøn Done +--UEXPECTF-- +*** Testing for error conditions *** + +Warning: substr() expects at least 2 parameters, 0 given in %s on line %d +NULL + +Warning: substr() expects at least 2 parameters, 1 given in %s on line %d +NULL + +Warning: substr() expects at least 2 parameters, 1 given in %s on line %d +NULL + +Warning: substr() expects at least 2 parameters, 1 given in %s on line %d +NULL + +Warning: substr() expects at most 3 parameters, 4 given in %s on line %d +NULL + +--- Iteration 1 --- + +-- Variations for two arguments -- +bool(false) +bool(false) +bool(false) + +-- Variations for three arguments -- +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) + +--- Iteration 2 --- + +-- Variations for two arguments -- +bool(false) +bool(false) +bool(false) + +-- Variations for three arguments -- +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) + +--- Iteration 3 --- + +-- Variations for two arguments -- +unicode(4) 2345 +unicode(5) 12345 +unicode(2) 45 + +-- Variations for three arguments -- +unicode(3) 234 +unicode(0) +unicode(1) 2 +unicode(3) 123 +unicode(0) +unicode(2) 12 +unicode(2) 45 +unicode(0) +unicode(0) + +--- Iteration 4 --- + +-- Variations for two arguments -- +unicode(5) bcdef +unicode(6) abcdef +unicode(2) ef + +-- Variations for three arguments -- +unicode(3) bcd +unicode(0) +unicode(2) bc +unicode(3) abc +unicode(0) +unicode(3) abc +unicode(2) ef +unicode(0) +unicode(0) + +--- Iteration 5 --- + +-- Variations for two arguments -- +unicode(5) 23abc +unicode(6) 123abc +unicode(2) bc + +-- Variations for three arguments -- +unicode(3) 23a +unicode(0) +unicode(2) 23 +unicode(3) 123 +unicode(0) +unicode(3) 123 +unicode(2) bc +unicode(0) +unicode(0) + +--- Iteration 6 --- + +-- Variations for two arguments -- +unicode(6) 123abc +unicode(7) _123abc +unicode(2) bc + +-- Variations for three arguments -- +unicode(3) 123 +unicode(0) +unicode(3) 123 +unicode(3) _12 +unicode(0) +unicode(4) _123 +unicode(2) bc +unicode(0) +unicode(0) + +*** Testing for variations of start and length to point to same element *** +unicode(1) c +unicode(1) c + +*** Testing for start truncation *** +unicode(0) + +*** Testing for string with null characters *** +unicode(6) c+ +*** Testing for string with international characters *** +unicode(26) ñtërnâtiônà lizætiøn + +Done
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi fastcgi.c
dmitry Mon Jul 9 11:48:39 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi fastcgi.c
Log:
ECONNABORTED is not a critical error (Andrei Nigmatulin)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.26r2=1.4.2.13.2.27diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.26
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.27
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.26Mon May 21 09:08:13 2007
+++ php-src/sapi/cgi/fastcgi.c Mon Jul 9 11:48:39 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.26 2007/05/21 09:08:13 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.27 2007/07/09 11:48:39 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -927,7 +927,11 @@
}
}
+#ifdef _WIN32
if (req-fd 0 (in_shutdown || errno !=
EINTR)) {
+#else
+ if (req-fd 0 (in_shutdown || (errno !=
EINTR errno != ECONNABORTED))) {
+#endif
return -1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_pgsql config.m4
janiMon Jul 9 12:53:52 2007 UTC Modified files: /php-src/ext/pdo_pgsql config.m4 Log: - Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.16r2=1.17diff_format=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.16 php-src/ext/pdo_pgsql/config.m4:1.17 --- php-src/ext/pdo_pgsql/config.m4:1.16Mon Jul 9 12:37:57 2007 +++ php-src/ext/pdo_pgsql/config.m4 Mon Jul 9 12:53:52 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.16 2007/07/09 12:37:57 jani Exp $ +dnl $Id: config.m4,v 1.17 2007/07/09 12:53:52 jani Exp $ dnl if test $PHP_PDO != no; then @@ -71,8 +71,10 @@ AC_MSG_CHECKING([for openssl dependencies]) if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then AC_MSG_RESULT([yes]) -if pkg-config openssl ; then - PDO_PGSQL_CFLAGS=`pkg-config openssl --cflags` +dnl First try to find pkg-config +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test -x $PKG_CONFIG $PKG_CONFIG --exists openssl; then + PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags` fi else AC_MSG_RESULT([no]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_pgsql config.m4
janiMon Jul 9 12:54:11 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_pgsql config.m4 Log: MFH:- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present) http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.13.4.3r2=1.13.4.4diff_format=u Index: php-src/ext/pdo_pgsql/config.m4 diff -u php-src/ext/pdo_pgsql/config.m4:1.13.4.3 php-src/ext/pdo_pgsql/config.m4:1.13.4.4 --- php-src/ext/pdo_pgsql/config.m4:1.13.4.3Mon Jul 9 12:38:02 2007 +++ php-src/ext/pdo_pgsql/config.m4 Mon Jul 9 12:54:11 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.13.4.3 2007/07/09 12:38:02 jani Exp $ +dnl $Id: config.m4,v 1.13.4.4 2007/07/09 12:54:11 jani Exp $ dnl if test $PHP_PDO != no; then @@ -71,8 +71,10 @@ AC_MSG_CHECKING([for openssl dependencies]) if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then AC_MSG_RESULT([yes]) -if pkg-config openssl ; then - PDO_PGSQL_CFLAGS=`pkg-config openssl --cflags` +dnl First try to find pkg-config +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test -x $PKG_CONFIG $PKG_CONFIG --exists openssl; then + PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags` fi else AC_MSG_RESULT([no]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
janiMon Jul 9 12:55:51 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: bfn http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.821r2=1.2027.2.547.2.822diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.821 php-src/NEWS:1.2027.2.547.2.822 --- php-src/NEWS:1.2027.2.547.2.821 Mon Jul 9 10:17:51 2007 +++ php-src/NEWSMon Jul 9 12:55:50 2007 @@ -120,6 +120,8 @@ - Fixed bug #40419 (Trailing Slash in CGI request don't work). (Dmitry) - Fixed bug #39330 (apache2handler does not call shutdown actions before apache child die). (isk at ecommerce dot com, Gopal, Tony) +- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present). + (Jani) 31 May 2007, PHP 5.2.3 - Changed CGI install target to php-cgi and 'make install' to install CLI @@ -218,14 +220,14 @@ - Improved bundled GD . Sync to 2.0.35 . Added imagegrabwindow and imagegrabscreen, capture a screen or a - window using its handle (Pierre) +window using its handle (Pierre) . colors allocated henceforth from the resulting image overwrite the palette - colors (Rob Leslie) +colors (Rob Leslie) . Improved thread safety of the gif support (Roman Nemecek, Nuno, Pierre) - . Use the dimension of the GIF frame to create the destination image (Pierre) - . Load only once the local color map from a GIF data (Pierre) + . Use the dimension of the GIF frame to create the destination image (Pierre) + . Load only once the local color map from a GIF data (Pierre) . Improved thread safety of the freetype cache (Scott MacVicar, Nuno, Pierre) - . imagearc huge CPU usage with large angles, libgd bug #74 (Pierre) + . imagearc huge CPU usage with large angles, libgd bug #74 (Pierre) - Improved FastCGI SAPI to support external pipe and socket servers on win32. (Dmitry) - Improved Zend Memory Manager @@ -1371,7 +1373,7 @@ aborted FastCGI err). (Dmitry) - Fixed bug #37192 (cc may complain about non-constant initializers in hash_adler.c). (Mike) -- Fixed bug #37191 (chmod takes off sticky bit when safe_mode is On). (Tony) +- Fixed bug #37191 (chmod takes off sticky bit when safe_mode is On). (Tony) - Fixed bug #37167 (PDO segfaults when throwing exception from the fetch handler). (Tony) - Fixed bug #37162 (wddx does not build as a shared extension). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection/tests reflectionClass_constructor_001.phpt reflectionClass_constructor_002.phpt
zoe Mon Jul 9 13:22:10 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests reflectionClass_constructor_001.phpt
reflectionClass_constructor_002.phpt
Log:
ReflectionClass constructor tests
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_constructor_001.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_constructor_001.phpt
+++ php-src/ext/reflection/tests/reflectionClass_constructor_001.phpt
--TEST--
ReflectionClass::__constructor()
--FILE--
?php
$r1 = new ReflectionClass(stdClass);
$myInstance = new stdClass;
$r2 = new ReflectionClass($myInstance);
class TrickClass {
function __toString() {
//Return the name of another class
return Exception;
}
}
$myTrickClass = new TrickClass;
$r3 = new ReflectionClass($myTrickClass);
var_dump($r1, $r2, $r3);
?
--EXPECTF--
object(ReflectionClass)#%d (1) {
[name]=
string(8) stdClass
}
object(ReflectionClass)#%d (1) {
[name]=
string(8) stdClass
}
object(ReflectionClass)#%d (1) {
[name]=
string(10) TrickClass
}
--UEXPECTF--
object(ReflectionClass)#%d (1) {
[uname]=
unicode(8) stdClass
}
object(ReflectionClass)#%d (1) {
[uname]=
unicode(8) stdClass
}
object(ReflectionClass)#%d (1) {
[uname]=
unicode(10) TrickClass
}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_constructor_002.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_constructor_002.phpt
+++ php-src/ext/reflection/tests/reflectionClass_constructor_002.phpt
--TEST--
ReflectionClass::__constructor() - bad arguments
--FILE--
?php
try {
var_dump(new ReflectionClass());
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(null));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(true));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(1));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(array(1,2,3)));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(stdClass, 1));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(X));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
?
--EXPECTF--
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in
%s on line 3
object(ReflectionClass)#%d (1) {
[name]=
string(0)
}
Class does not exist
Class 1 does not exist
Class 1 does not exist
Warning: ReflectionClass::__construct() expects parameter 1 to be string
(Unicode or binary), array given in %s on line 27
object(ReflectionClass)#3 (1) {
[name]=
string(0)
}
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 2 given in
%s on line 33
object(ReflectionClass)#%d (1) {
[name]=
string(0)
}
Class X does not exist
--UEXPECTF--
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in
%s on line 3
object(ReflectionClass)#%d (1) {
[uname]=
unicode(0)
}
Class does not exist
Class 1 does not exist
Class 1 does not exist
Warning: ReflectionClass::__construct() expects parameter 1 to be string
(Unicode or binary), array given in %s on line 27
object(ReflectionClass)#3 (1) {
[uname]=
unicode(0)
}
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 2 given in
%s on line 33
object(ReflectionClass)#%d (1) {
[uname]=
unicode(0)
}
Class X does not exist
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/snmp snmp.c
janiMon Jul 9 13:41:46 2007 UTC
Modified files:
/php-src/ext/snmp snmp.c
Log:
- Use the defined values instead of plain integers here
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.112r2=1.113diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.112 php-src/ext/snmp/snmp.c:1.113
--- php-src/ext/snmp/snmp.c:1.112 Mon Jan 1 09:29:29 2007
+++ php-src/ext/snmp/snmp.c Mon Jul 9 13:41:45 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.112 2007/01/01 09:29:29 sebastian Exp $ */
+/* $Id: snmp.c,v 1.113 2007/07/09 13:41:45 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -184,7 +184,7 @@
*/
static PHP_GINIT_FUNCTION(snmp)
{
- snmp_globals-valueretrieval = 0;
+ snmp_globals-valueretrieval = SNMP_VALUE_LIBRARY;
}
/* }}} */
@@ -262,7 +262,7 @@
buf[0] = 0;
- if (SNMP_G(valueretrieval) == 0) {
+ if (SNMP_G(valueretrieval) == SNMP_VALUE_LIBRARY) {
#ifdef HAVE_NET_SNMP
snprint_value(buf, sizeof(buf), vars-name, vars-name_length,
vars);
#else
@@ -332,7 +332,7 @@
break;
}
- if (SNMP_G(valueretrieval) == 1) {
+ if (SNMP_G(valueretrieval) == SNMP_VALUE_PLAIN) {
*snmpval = *val;
zval_copy_ctor(snmpval);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/snmp snmp.c
janiMon Jul 9 13:42:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/snmp snmp.c
Log:
MFH: use defined values instead of plain integers
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.4r2=1.106.2.2.2.5diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.4
php-src/ext/snmp/snmp.c:1.106.2.2.2.5
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.4 Mon Jan 1 09:36:06 2007
+++ php-src/ext/snmp/snmp.c Mon Jul 9 13:42:05 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.106.2.2.2.4 2007/01/01 09:36:06 sebastian Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.5 2007/07/09 13:42:05 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -184,7 +184,7 @@
*/
static PHP_GINIT_FUNCTION(snmp)
{
- snmp_globals-valueretrieval = 0;
+ snmp_globals-valueretrieval = SNMP_VALUE_LIBRARY;
}
/* }}} */
@@ -262,7 +262,7 @@
buf[0] = 0;
- if (SNMP_G(valueretrieval) == 0) {
+ if (SNMP_G(valueretrieval) == SNMP_VALUE_LIBRARY) {
#ifdef HAVE_NET_SNMP
snprint_value(buf, sizeof(buf), vars-name, vars-name_length,
vars);
#else
@@ -332,7 +332,7 @@
break;
}
- if (SNMP_G(valueretrieval) == 1) {
+ if (SNMP_G(valueretrieval) == SNMP_VALUE_PLAIN) {
*snmpval = *val;
zval_copy_ctor(snmpval);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c var_unserializer.re
dmitry Mon Jul 9 13:43:51 2007 UTC Modified files: /php-src/ext/standard var_unserializer.c var_unserializer.re Log: Fixed deserialization of escaped strings http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.86r2=1.87diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.86 php-src/ext/standard/var_unserializer.c:1.87 --- php-src/ext/standard/var_unserializer.c:1.86Tue Mar 27 09:28:49 2007 +++ php-src/ext/standard/var_unserializer.c Mon Jul 9 13:43:50 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: var_unserializer.c,v 1.86 2007/03/27 09:28:49 tony2001 Exp $ */ +/* $Id: var_unserializer.c,v 1.87 2007/07/09 13:43:50 dmitry Exp $ */ #include php.h #include ext/standard/php_var.h @@ -142,6 +142,7 @@ return NULL; } } + end += 2; str[i] = (char)ch; } (*p)++; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.64r2=1.65diff_format=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.64 php-src/ext/standard/var_unserializer.re:1.65 --- php-src/ext/standard/var_unserializer.re:1.64 Tue Mar 27 09:28:49 2007 +++ php-src/ext/standard/var_unserializer.reMon Jul 9 13:43:50 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: var_unserializer.re,v 1.64 2007/03/27 09:28:49 tony2001 Exp $ */ +/* $Id: var_unserializer.re,v 1.65 2007/07/09 13:43:50 dmitry Exp $ */ #include php.h #include ext/standard/php_var.h @@ -140,6 +140,7 @@ return NULL; } } + end += 2; str[i] = (char)ch; } (*p)++; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection/tests reflectionClass_constructor_001.phpt reflectionClass_constructor_002.phpt
zoe Mon Jul 9 13:13:35 2007 UTC
Added files:
/php-src/ext/reflection/tests reflectionClass_constructor_001.phpt
reflectionClass_constructor_002.phpt
Log:
ReflectionClass constructor tests
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_constructor_001.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_constructor_001.phpt
+++ php-src/ext/reflection/tests/reflectionClass_constructor_001.phpt
--TEST--
ReflectionClass::__constructor()
--FILE--
?php
$r1 = new ReflectionClass(stdClass);
$myInstance = new stdClass;
$r2 = new ReflectionClass($myInstance);
class TrickClass {
function __toString() {
//Return the name of another class
return Exception;
}
}
$myTrickClass = new TrickClass;
$r3 = new ReflectionClass($myTrickClass);
var_dump($r1, $r2, $r3);
?
--EXPECTF--
object(ReflectionClass)#%d (1) {
[name]=
string(8) stdClass
}
object(ReflectionClass)#%d (1) {
[name]=
string(8) stdClass
}
object(ReflectionClass)#%d (1) {
[name]=
string(10) TrickClass
}
--UEXPECTF--
object(ReflectionClass)#%d (1) {
[uname]=
unicode(8) stdClass
}
object(ReflectionClass)#%d (1) {
[uname]=
unicode(8) stdClass
}
object(ReflectionClass)#%d (1) {
[uname]=
unicode(10) TrickClass
}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_constructor_002.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_constructor_002.phpt
+++ php-src/ext/reflection/tests/reflectionClass_constructor_002.phpt
--TEST--
ReflectionClass::__constructor() - bad arguments
--FILE--
?php
try {
var_dump(new ReflectionClass());
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(null));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(true));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(1));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(array(1,2,3)));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(stdClass, 1));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
try {
var_dump(new ReflectionClass(X));
} catch (Exception $e) {
echo $e-getMessage() . \n;
}
?
--EXPECTF--
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in
%s on line 3
object(ReflectionClass)#%d (1) {
[name]=
string(0)
}
Class does not exist
Class 1 does not exist
Class 1 does not exist
Warning: ReflectionClass::__construct() expects parameter 1 to be string
(Unicode or binary), array given in %s on line 27
object(ReflectionClass)#3 (1) {
[name]=
string(0)
}
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 2 given in
%s on line 33
object(ReflectionClass)#%d (1) {
[name]=
string(0)
}
Class X does not exist
--UEXPECTF--
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in
%s on line 3
object(ReflectionClass)#%d (1) {
[uname]=
unicode(0)
}
Class does not exist
Class 1 does not exist
Class 1 does not exist
Warning: ReflectionClass::__construct() expects parameter 1 to be string
(Unicode or binary), array given in %s on line 27
object(ReflectionClass)#3 (1) {
[uname]=
unicode(0)
}
Warning: ReflectionClass::__construct() expects exactly 1 parameter, 2 given in
%s on line 33
object(ReflectionClass)#%d (1) {
[uname]=
unicode(0)
}
Class X does not exist
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/serialize unserializeS.phpt
dmitry Mon Jul 9 14:31:56 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard var_unserializer.c var_unserializer.re
/php-src/ext/standard/tests/serialize unserializeS.phpt
Log:
Proper fix for MOPB-29
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.5r2=1.70.2.4.2.6diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.5
php-src/ext/standard/var_unserializer.c:1.70.2.4.2.6
--- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.5Tue Mar 27
09:29:10 2007
+++ php-src/ext/standard/var_unserializer.c Mon Jul 9 14:31:56 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var_unserializer.c,v 1.70.2.4.2.5 2007/03/27 09:29:10 tony2001 Exp $ */
+/* $Id: var_unserializer.c,v 1.70.2.4.2.6 2007/07/09 14:31:56 dmitry Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -140,18 +140,22 @@
/* }}} */
-static char *unserialize_str(const unsigned char **p, size_t *len)
+static char *unserialize_str(const unsigned char **p, size_t *len, size_t
maxlen)
{
size_t i, j;
char *str = safe_emalloc(*len, 1, 1);
- unsigned char *end = *(unsigned char **)p+*len;
+ unsigned char *end = *(unsigned char **)p+maxlen;
if(end *p) {
efree(str);
return NULL;
}
- for (i = 0; i *len *p end; i++) {
+ for (i = 0; i *len; i++) {
+ if (*p = end) {
+ efree(str);
+ return NULL;
+ }
if (**p != '\\') {
str[i] = (char)**p;
} else {
@@ -757,7 +761,7 @@
return 0;
}
- if ((str = unserialize_str(YYCURSOR, len)) == NULL) {
+ if ((str = unserialize_str(YYCURSOR, len, maxlen)) == NULL) {
return 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.3r2=1.52.2.2.2.4diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.52.2.2.2.3
php-src/ext/standard/var_unserializer.re:1.52.2.2.2.4
--- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.3 Tue Mar 27
09:29:10 2007
+++ php-src/ext/standard/var_unserializer.reMon Jul 9 14:31:56 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: var_unserializer.re,v 1.52.2.2.2.3 2007/03/27 09:29:10 tony2001 Exp $
*/
+/* $Id: var_unserializer.re,v 1.52.2.2.2.4 2007/07/09 14:31:56 dmitry Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -138,18 +138,22 @@
/* }}} */
-static char *unserialize_str(const unsigned char **p, size_t *len)
+static char *unserialize_str(const unsigned char **p, size_t *len, size_t
maxlen)
{
size_t i, j;
char *str = safe_emalloc(*len, 1, 1);
- unsigned char *end = *(unsigned char **)p+*len;
+ unsigned char *end = *(unsigned char **)p+maxlen;
if(end *p) {
efree(str);
return NULL;
}
- for (i = 0; i *len *p end; i++) {
+ for (i = 0; i *len; i++) {
+ if (*p = end) {
+ efree(str);
+ return NULL;
+ }
if (**p != '\\') {
str[i] = (char)**p;
} else {
@@ -525,7 +529,7 @@
return 0;
}
- if ((str = unserialize_str(YYCURSOR, len)) == NULL) {
+ if ((str = unserialize_str(YYCURSOR, len, maxlen)) == NULL) {
return 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/unserializeS.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/serialize/unserializeS.phpt
diff -u php-src/ext/standard/tests/serialize/unserializeS.phpt:1.1.2.1
php-src/ext/standard/tests/serialize/unserializeS.phpt:1.1.2.2
--- php-src/ext/standard/tests/serialize/unserializeS.phpt:1.1.2.1 Fri Mar
23 20:15:22 2007
+++ php-src/ext/standard/tests/serialize/unserializeS.phpt Mon Jul 9
14:31:56 2007
@@ -11,4 +11,4 @@
var_dump($data);
--EXPECT--
-string(100)
+bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c
dmitry Mon Jul 9 14:32:59 2007 UTC
Modified files:
/php-src/ext/standard array.c
Log:
wrong condition
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.410r2=1.411diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.410 php-src/ext/standard/array.c:1.411
--- php-src/ext/standard/array.c:1.410 Thu Jun 28 16:06:23 2007
+++ php-src/ext/standard/array.cMon Jul 9 14:32:59 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.410 2007/06/28 16:06:23 tony2001 Exp $ */
+/* $Id: array.c,v 1.411 2007/07/09 14:32:59 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -1403,7 +1403,7 @@
if (prefix) {
convert_to_text(prefix);
- if (Z_UNILEN_P(prefix)
!php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix), Z_TYPE_P(prefix))) {
+ if (!Z_UNILEN_P(prefix) ||
!php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix), Z_TYPE_P(prefix))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, prefix is
not a valid identifier);
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/serialize unserializeS.phpt
dmitry Mon Jul 9 14:33:37 2007 UTC
Modified files:
/php-src/ext/standard var_unserializer.c var_unserializer.re
/php-src/ext/standard/tests/serialize unserializeS.phpt
Log:
Proper fix for MOPB-29
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.87r2=1.88diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.87
php-src/ext/standard/var_unserializer.c:1.88
--- php-src/ext/standard/var_unserializer.c:1.87Mon Jul 9 13:43:50 2007
+++ php-src/ext/standard/var_unserializer.c Mon Jul 9 14:33:37 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var_unserializer.c,v 1.87 2007/07/09 13:43:50 dmitry Exp $ */
+/* $Id: var_unserializer.c,v 1.88 2007/07/09 14:33:37 dmitry Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -112,18 +112,22 @@
return ustr;
}
-static char *unserialize_str(const unsigned char **p, int *len)
+static char *unserialize_str(const unsigned char **p, size_t *len, size_t
maxlen)
{
size_t i, j;
char *str = safe_emalloc(*len, 1, 1);
- unsigned char *end = *(unsigned char **)p+*len;
+ unsigned char *end = *(unsigned char **)p+maxlen;
if(end *p) {
efree(str);
return NULL;
}
- for (i = 0; i *len *p end; i++) {
+ for (i = 0; i *len; i++) {
+ if (*p = end) {
+ efree(str);
+ return NULL;
+ }
if (**p != '\\') {
str[i] = (char)**p;
} else {
@@ -142,7 +146,6 @@
return NULL;
}
}
- end += 2;
str[i] = (char)ch;
}
(*p)++;
@@ -866,7 +869,7 @@
return 0;
}
- if ((str = unserialize_str(YYCURSOR, len)) == NULL) {
+ if ((str = unserialize_str(YYCURSOR, len, maxlen)) == NULL) {
return 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.65r2=1.66diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.65
php-src/ext/standard/var_unserializer.re:1.66
--- php-src/ext/standard/var_unserializer.re:1.65 Mon Jul 9 13:43:50 2007
+++ php-src/ext/standard/var_unserializer.reMon Jul 9 14:33:37 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: var_unserializer.re,v 1.65 2007/07/09 13:43:50 dmitry Exp $ */
+/* $Id: var_unserializer.re,v 1.66 2007/07/09 14:33:37 dmitry Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -110,18 +110,22 @@
return ustr;
}
-static char *unserialize_str(const unsigned char **p, int *len)
+static char *unserialize_str(const unsigned char **p, size_t *len, size_t
maxlen)
{
size_t i, j;
char *str = safe_emalloc(*len, 1, 1);
- unsigned char *end = *(unsigned char **)p+*len;
+ unsigned char *end = *(unsigned char **)p+maxlen;
if(end *p) {
efree(str);
return NULL;
}
- for (i = 0; i *len *p end; i++) {
+ for (i = 0; i *len; i++) {
+ if (*p = end) {
+ efree(str);
+ return NULL;
+ }
if (**p != '\\') {
str[i] = (char)**p;
} else {
@@ -140,7 +144,6 @@
return NULL;
}
}
- end += 2;
str[i] = (char)ch;
}
(*p)++;
@@ -578,7 +581,7 @@
return 0;
}
- if ((str = unserialize_str(YYCURSOR, len)) == NULL) {
+ if ((str = unserialize_str(YYCURSOR, len, maxlen)) == NULL) {
return 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/unserializeS.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/serialize/unserializeS.phpt
diff -u php-src/ext/standard/tests/serialize/unserializeS.phpt:1.2
php-src/ext/standard/tests/serialize/unserializeS.phpt:1.3
--- php-src/ext/standard/tests/serialize/unserializeS.phpt:1.2 Fri Mar 23
20:34:11 2007
+++ php-src/ext/standard/tests/serialize/unserializeS.phpt Mon Jul 9
14:33:37 2007
@@ -11,4 +11,4 @@
var_dump($data);
--EXPECT--
-string(100)
+bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/array count_recursive.phpt
dmitry Mon Jul 9 15:27:58 2007 UTC Modified files: /php-src/ext/standard/tests/array count_recursive.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/count_recursive.phpt?r1=1.6r2=1.7diff_format=u Index: php-src/ext/standard/tests/array/count_recursive.phpt diff -u php-src/ext/standard/tests/array/count_recursive.phpt:1.6 php-src/ext/standard/tests/array/count_recursive.phpt:1.7 --- php-src/ext/standard/tests/array/count_recursive.phpt:1.6 Fri Apr 20 21:13:45 2007 +++ php-src/ext/standard/tests/array/count_recursive.phpt Mon Jul 9 15:27:58 2007 @@ -224,13 +224,13 @@ Notice: Use of undefined constant ABCD - assumed 'ABCD' in %s on line %d -Warning: count() expects parameter 2 to be long, string given in %s on line %d +Warning: count() expects parameter 2 to be long, %s given in %s on line %d NULL -Warning: count() expects parameter 2 to be long, string given in %s on line %d +Warning: count() expects parameter 2 to be long, %s given in %s on line %d NULL -Warning: count() expects parameter 2 to be long, string given in %s on line %d +Warning: count() expects parameter 2 to be long, %s given in %s on line %d NULL Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c var_unserializer.re
dmitry Mon Jul 9 15:58:52 2007 UTC
Modified files:
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
Fixed custom unserialixe() in unicode mode
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.88r2=1.89diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.88
php-src/ext/standard/var_unserializer.c:1.89
--- php-src/ext/standard/var_unserializer.c:1.88Mon Jul 9 14:33:37 2007
+++ php-src/ext/standard/var_unserializer.c Mon Jul 9 15:58:52 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var_unserializer.c,v 1.88 2007/07/09 14:33:37 dmitry Exp $ */
+/* $Id: var_unserializer.c,v 1.89 2007/07/09 15:58:52 dmitry Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -359,6 +359,8 @@
{
long datalen;
int type;
+ zstr buf;
+ size_t buf_len;
if(ce-unserialize == NULL) {
zend_error(E_WARNING, Class %v has no unserializer, ce-name);
@@ -389,11 +391,23 @@
return 0;
}
- if(ce-unserialize(rval, ce, type, ZSTR((char*)*p), datalen,
(zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) {
+ if (type == IS_UNICODE) {
+ buf.u = unserialize_ustr(p, datalen);
+ buf_len = u_strlen(buf.u);
+ } else {
+ buf.s = (char*)*p;
+ buf_len = datalen;
+ (*p) += datalen;
+ }
+ if(ce-unserialize(rval, ce, type, buf, buf_len, (zend_unserialize_data
*)var_hash TSRMLS_CC) != SUCCESS) {
+ if (type == IS_UNICODE) {
+ efree(buf.v);
+ }
return 0;
}
-
- (*p) += datalen;
+ if (type == IS_UNICODE) {
+ efree(buf.v);
+ }
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.66r2=1.67diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.66
php-src/ext/standard/var_unserializer.re:1.67
--- php-src/ext/standard/var_unserializer.re:1.66 Mon Jul 9 14:33:37 2007
+++ php-src/ext/standard/var_unserializer.reMon Jul 9 15:58:52 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: var_unserializer.re,v 1.66 2007/07/09 14:33:37 dmitry Exp $ */
+/* $Id: var_unserializer.re,v 1.67 2007/07/09 15:58:52 dmitry Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -363,6 +363,8 @@
{
long datalen;
int type;
+ zstr buf;
+ size_t buf_len;
if(ce-unserialize == NULL) {
zend_error(E_WARNING, Class %v has no unserializer, ce-name);
@@ -393,11 +395,23 @@
return 0;
}
- if(ce-unserialize(rval, ce, type, ZSTR((char*)*p), datalen,
(zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) {
+ if (type == IS_UNICODE) {
+ buf.u = unserialize_ustr(p, datalen);
+ buf_len = u_strlen(buf.u);
+ } else {
+ buf.s = (char*)*p;
+ buf_len = datalen;
+ (*p) += datalen;
+ }
+ if(ce-unserialize(rval, ce, type, buf, buf_len, (zend_unserialize_data
*)var_hash TSRMLS_CC) != SUCCESS) {
+ if (type == IS_UNICODE) {
+ efree(buf.v);
+ }
return 0;
}
-
- (*p) += datalen;
+ if (type == IS_UNICODE) {
+ efree(buf.v);
+ }
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_streams.h
dmitry Mon Jul 9 16:42:45 2007 UTC Modified files: /php-src/main php_streams.h Log: wrong comments http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.129r2=1.130diff_format=u Index: php-src/main/php_streams.h diff -u php-src/main/php_streams.h:1.129 php-src/main/php_streams.h:1.130 --- php-src/main/php_streams.h:1.129Tue Jul 3 10:22:55 2007 +++ php-src/main/php_streams.h Mon Jul 9 16:42:45 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_streams.h,v 1.129 2007/07/03 10:22:55 dmitry Exp $ */ +/* $Id: php_streams.h,v 1.130 2007/07/09 16:42:45 dmitry Exp $ */ #ifndef PHP_STREAMS_H #define PHP_STREAMS_H @@ -619,7 +619,7 @@ /* use glob stream for directory open in plain files stream */ #define STREAM_USE_GLOB_DIR_OPEN0x1000 -/* use glob stream for directory open in plain files stream */ +/* don't check allow_url_fopen and allow_url_include */ #define STREAM_DISABLE_URL_PROTECTION 0x2000 /* Antique - no longer has meaning */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h /ext/standard/tests/file include_userstream_001.phpt include_userstream_002.phpt /main main.c php_global
dmitry Mon Jul 9 17:27:24 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/fileinclude_userstream_001.phpt
include_userstream_002.phpt
Modified files:
/php-src/main main.c php_globals.h php_streams.h
/php-src/main/streams streams.c userspace.c
/php-src/ext/standard basic_functions.c streamsfuncs.c
streamsfuncs.h
Log:
Added ability to create local or remote (URL) user streams
Local user streams must not be able to open(), URLs if allow_url_include is
off
Implemented new function stream_is_local()
[
- stream_wrapper_register() extended with additional optional argument flags
of type long. This time only one flag is implemented
- STREAM_IS_URL, that means that userstream wrapper is remote (URL).
By default stream is local.
- stream_is_local() is a new function that accepts stream and tell if this
stream is local or remote (URL)
]
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.38r2=1.640.2.23.2.39diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.38 php-src/main/main.c:1.640.2.23.2.39
--- php-src/main/main.c:1.640.2.23.2.38 Fri Jun 15 09:20:27 2007
+++ php-src/main/main.c Mon Jul 9 17:27:23 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.38 2007/06/15 09:20:27 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.39 2007/07/09 17:27:23 dmitry Exp $ */
/* {{{ includes
*/
@@ -1121,6 +1121,7 @@
PG(modules_activated) = 0;
PG(header_is_being_sent) = 0;
PG(connection_status) = PHP_CONNECTION_NORMAL;
+ PG(in_user_include) = 0;
zend_activate(TSRMLS_C);
sapi_activate(TSRMLS_C);
http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.98.2.1.2.5r2=1.98.2.1.2.6diff_format=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.98.2.1.2.5
php-src/main/php_globals.h:1.98.2.1.2.6
--- php-src/main/php_globals.h:1.98.2.1.2.5 Fri Mar 2 21:58:05 2007
+++ php-src/main/php_globals.h Mon Jul 9 17:27:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_globals.h,v 1.98.2.1.2.5 2007/03/02 21:58:05 stas Exp $ */
+/* $Id: php_globals.h,v 1.98.2.1.2.6 2007/07/09 17:27:23 dmitry Exp $ */
#ifndef PHP_GLOBALS_H
#define PHP_GLOBALS_H
@@ -156,6 +156,7 @@
zend_bool com_initialized;
#endif
long max_input_nesting_level;
+ zend_bool in_user_include;
};
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.103.2.1.2.2r2=1.103.2.1.2.3diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.103.2.1.2.2
php-src/main/php_streams.h:1.103.2.1.2.3
--- php-src/main/php_streams.h:1.103.2.1.2.2Wed Feb 21 21:57:21 2007
+++ php-src/main/php_streams.h Mon Jul 9 17:27:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams.h,v 1.103.2.1.2.2 2007/02/21 21:57:21 tony2001 Exp $ */
+/* $Id: php_streams.h,v 1.103.2.1.2.3 2007/07/09 17:27:23 dmitry Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -499,6 +499,9 @@
/* get (or create) a persistent version of the stream */
#define STREAM_OPEN_PERSISTENT 2048
+/* don't check allow_url_fopen and allow_url_include */
+#define STREAM_DISABLE_URL_PROTECTION 0x2000
+
/* Antique - no longer has meaning */
#define IGNORE_URL_WIN 0
@@ -550,6 +553,9 @@
END_EXTERN_C()
#endif
+/* Definitions for user streams */
+#define PHP_STREAM_IS_URL 1
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.13r2=1.82.2.6.2.14diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.13
php-src/main/streams/streams.c:1.82.2.6.2.14
--- php-src/main/streams/streams.c:1.82.2.6.2.13Tue May 8 12:08:17 2007
+++ php-src/main/streams/streams.c Mon Jul 9 17:27:23 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.13 2007/05/08 12:08:17 dmitry Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.14 2007/07/09 17:27:23 dmitry Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1606,7 +1606,11 @@
return php_plain_files_wrapper;
}
- if ((wrapperpp (*wrapperpp)-is_url) (!PG(allow_url_fopen) ||
((options STREAM_OPEN_FOR_INCLUDE) !PG(allow_url_include))) ) {
+ if (wrapperpp (*wrapperpp)-is_url
+(options STREAM_DISABLE_URL_PROTECTION) == 0
+ (!PG(allow_url_fopen) ||
+((options STREAM_OPEN_FOR_INCLUDE) ||
+
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file mkdir_rmdir_variation1.phpt mkdir_rmdir_variation2.phpt popen_pclose_error-sunos.phpt popen_pclose_error.phpt readlink_realpath_basic1.phpt rea
kraghubaMon Jul 9 17:38:33 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filepopen_pclose_error-sunos.phpt readlink_realpath_variation1.phpt mkdir_rmdir_variation1.phpt readlink_realpath_variation2.phpt mkdir_rmdir_variation2.phpt readlink_realpath_variation3.phpt readlink_realpath_basic1.phpt readlink_realpath_basic2.phpt Modified files: /php-src/ext/standard/tests/filereadlink_realpath_error.phpt popen_pclose_error.phpt Log: Fix and smaller testcases for mkdir_rmdir_variation.phpt, popen_pclose_error.phpt, readlink_realpath_basic.phpt, readlink_realpath_error.phpt readlink_realpath_variation.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/readlink_realpath_error.phpt diff -u php-src/ext/standard/tests/file/readlink_realpath_error.phpt:1.1.2.1 php-src/ext/standard/tests/file/readlink_realpath_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/readlink_realpath_error.phpt:1.1.2.1 Mon Jun 11 16:14:59 2007 +++ php-src/ext/standard/tests/file/readlink_realpath_error.phptMon Jul 9 17:38:33 2007 @@ -69,5 +69,5 @@ NULL *** Testing realpath() on a non-existent file *** -bool(false) +%s Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/popen_pclose_error.phpt diff -u php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.1 php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.1 Mon Jun 11 16:14:59 2007 +++ php-src/ext/standard/tests/file/popen_pclose_error.phpt Mon Jul 9 17:38:33 2007 @@ -2,8 +2,8 @@ Test popen() and pclose function: error conditions --SKIPIF-- ?php -if(substr(PHP_OS, 0, 3) == 'WIN' ) - die(skip Not Valid for Windows); +if(substr(PHP_OS, 0, 3) == 'WIN' || substr(PHP_OS, 0, 3) == 'Sun') + die(skip Not Valid for Windows and Sun Solaris); ? --FILE-- @@ -41,7 +41,7 @@ Warning: Wrong parameter count for popen() in %s on line %d NULL -Warning: popen(abc.txt,rw): Invalid argument in %s on line %d +Warning: popen(abc.txt,rw): %s on line %d bool(false) Warning: Wrong parameter count for pclose() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt +++ php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt +++ php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_rmdir_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/mkdir_rmdir_variation1.phpt +++ php-src/ext/standard/tests/file/mkdir_rmdir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt +++ php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt +++ php-src/ext/standard/tests/file/mkdir_rmdir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt +++ php-src/ext/standard/tests/file/readlink_realpath_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt +++ php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt +++ php-src/ext/standard/tests/file/readlink_realpath_basic2.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file mkdir_rmdir_variation.phpt readlink_realpath_basic.phpt readlink_realpath_variation.phpt
kraghubaMon Jul 9 17:52:42 2007 UTC Removed files: /php-src/ext/standard/tests/filereadlink_realpath_basic.phpt readlink_realpath_variation.phpt mkdir_rmdir_variation.phpt Log: These testcases are now split into smaller testcases, hence being deleted -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file mkdir_rmdir_variation.phpt readlink_realpath_basic.phpt readlink_realpath_variation.phpt
kraghubaMon Jul 9 17:55:34 2007 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filereadlink_realpath_basic.phpt readlink_realpath_variation.phpt mkdir_rmdir_variation.phpt Log: These testcases are now split into smaller testcases, hence being deleted -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard filestat.c
tony2001Mon Jul 9 18:10:17 2007 UTC
Modified files:
/php-src/ext/standard filestat.c
Log:
fix build on b0rked OSes (see #41920)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.160r2=1.161diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.160
php-src/ext/standard/filestat.c:1.161
--- php-src/ext/standard/filestat.c:1.160 Mon Feb 26 20:35:41 2007
+++ php-src/ext/standard/filestat.c Mon Jul 9 18:10:17 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.160 2007/02/26 20:35:41 tony2001 Exp $ */
+/* $Id: filestat.c,v 1.161 2007/07/09 18:10:17 tony2001 Exp $ */
#include php.h
#include fopen_wrappers.h
@@ -434,7 +434,7 @@
if (Z_TYPE_P(group) == IS_LONG) {
gid = (gid_t)Z_LVAL_P(group);
} else {
-#if HAVE_GETGRNAM_R
+#if defined(ZTS) defined(HAVE_GETGRNAM_R) defined(_SC_GETGR_R_SIZE_MAX)
struct group gr;
struct group *retgrptr;
int grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
