[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Feb 3 06:31:41 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2244r2=1.2245diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2244 php-src/ChangeLog:1.2245 --- php-src/ChangeLog:1.2244Thu Feb 2 06:31:41 2006 +++ php-src/ChangeLog Fri Feb 3 06:31:41 2006 @@ -1,3 +1,70 @@ +2006-02-02 Antony Dovgal [EMAIL PROTECTED] + +* ext/xml/xml.c: + MF51: nuke unused variable + +* (PHP_5_1) + ext/xml/xml.c: + nuke unused variable + +2006-02-02 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gd/gd.c + ext/gd/libgd/gd.h + ext/gd/libgd/gd_jpeg.c: + - add a weak/tolerant mode to the jpeg loader + * new INI option to enable it (off by default) + gd.jpeg_ignore_warning (0|1) + * The default mode is the current behavior + * if the warning mode is enabled, the image may be loaded succesfully + but the jpeg warnings will be raise as notices + +2006-02-02 Sara Golemon [EMAIL PROTECTED] + +* (PHP_5_1) + main/streams/xp_socket.c: + MFH: Prevent bindport from being used uninitialized + +* main/streams/xp_socket.c: + Prevent bindport from being used uninitialized + +2006-02-02 Antony Dovgal [EMAIL PROTECTED] + +* ext/zlib/tests/gzreadgzwrite.phpt + ext/zlib/tests/gzreadgzwriteplain.phpt: + fix tests + +* (PHP_5_1) + NEWS: + fix #36258 (SplFileObject::getPath() may lead to segfault) + +2006-02-02 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Bug #36226 Inconsistent handling when passing potential arrays + +* sapi/cgi/config9.m4 + sapi/cgi/config9.m4 + sapi/cli/config.m4 + sapi/cli/config.m4: + AIX support + +* (PHP_5_1) + NEWS + sapi/cgi/cgi_main.c + sapi/cgi/config.w32 + sapi/cgi/config9.m4 + sapi/cgi/fastcgi.c + sapi/cgi/fastcgi.h: + Reimplement FastCGI interface + + Due to licensing restrictions that actually don't allow anybody to use + the libfcgi code without prior approval from Open Market, which is + impossible to obtain - we decided to reimplement this interface from + scratch. The result is actually slightly faster, and more importantly, + clear of any copyright issues. + 2006-02-01 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_1)
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /sapi/cgi cgi_main.c config.w32 config9.m4 fastcgi.c fastcgi.h
dmitry Thu Feb 2 08:17:23 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/sapi/cgi fastcgi.c fastcgi.h
Modified files:
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c config.w32 config9.m4
Log:
Reimplement FastCGI interface
Due to licensing restrictions that actually don't allow anybody to use
the libfcgi code without prior approval from Open Market, which is
impossible to obtain - we decided to reimplement this interface from
scratch. The result is actually slightly faster, and more importantly,
clear of any copyright issues.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.391r2=1.2027.2.392diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.391 php-src/NEWS:1.2027.2.392
--- php-src/NEWS:1.2027.2.391 Wed Feb 1 17:05:38 2006
+++ php-src/NEWSThu Feb 2 08:17:23 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.1.3
+- Reimplemented FastCGI interface
- Moved extensions to PECL:
. ext/msession (Derick)
- Improved cURL extension: (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.5r2=1.267.2.6diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.5
php-src/sapi/cgi/cgi_main.c:1.267.2.6
--- php-src/sapi/cgi/cgi_main.c:1.267.2.5 Sun Jan 1 12:50:18 2006
+++ php-src/sapi/cgi/cgi_main.c Thu Feb 2 08:17:23 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.5 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.6 2006/02/02 08:17:23 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -79,9 +79,7 @@
#include php_getopt.h
#if PHP_FASTCGI
-#include fcgi_config.h
-#include fcgiapp.h
-/* don't want to include fcgios.h, causes conflicts */
+#include fastcgi.h
#ifdef PHP_WIN32
extern int OS_SetImpersonate(void);
#else
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config.w32?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/sapi/cgi/config.w32
diff -u php-src/sapi/cgi/config.w32:1.2 php-src/sapi/cgi/config.w32:1.2.4.1
--- php-src/sapi/cgi/config.w32:1.2 Thu Jan 8 10:56:39 2004
+++ php-src/sapi/cgi/config.w32 Thu Feb 2 08:17:23 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2004/01/08 10:56:39 wez Exp $
+// $Id: config.w32,v 1.2.4.1 2006/02/02 08:17:23 dmitry Exp $
ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
ARG_ENABLE('fastcgi', 'Build FastCGI support into CGI binary', 'yes');
@@ -16,8 +16,7 @@
if (PHP_CGI == yes) {
AC_DEFINE('PHP_FASTCGI', PHP_FASTCGI == yes ? 1 : 0);
if (PHP_FASTCGI == yes) {
- SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe', '/I
sapi/cgi/libfcgi/include /D FCGI_STATIC');
- ADD_SOURCES('sapi/cgi/libfcgi', 'fcgi_stdio.c fcgiapp.c
os_win32.c', 'cgi');
+ SAPI('cgi', 'cgi_main.c getopt.c fastcgi.c', 'php-cgi.exe', '/I
sapi/cgi/libfcgi/include /D FCGI_STATIC');
ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
} else {
SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe');
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config9.m4?r1=1.17r2=1.17.2.1diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.17 php-src/sapi/cgi/config9.m4:1.17.2.1
--- php-src/sapi/cgi/config9.m4:1.17Thu Jul 7 05:54:43 2005
+++ php-src/sapi/cgi/config9.m4 Thu Feb 2 08:17:23 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.17 2005/07/07 05:54:43 dmitry Exp $
+dnl $Id: config9.m4,v 1.17.2.1 2006/02/02 08:17:23 dmitry Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -133,15 +133,12 @@
exit 1
fi
if test $PHP_ENABLE_FASTCGI = yes; then
- PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi)
PHP_FASTCGI=1
- PHP_FCGI_FILES=libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c
- PHP_FCGI_INCLUDE=-I$PHP_LIBFCGI_DIR/include
+ PHP_FCGI_FILES=fastcgi.c
PHP_FCGI_STATIC=1
else
PHP_FASTCGI=0
PHP_FCGI_FILES=
- PHP_FCGI_INCLUDE=
PHP_FCGI_STATIC=0
fi
AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ])
@@ -149,7 +146,7 @@
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
INSTALL_IT=@echo \Installing PHP CGI into:
\$(INSTALL_ROOT)\$(bindir)/\; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH)
\$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)
-PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,
$PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
+PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, ,
'$(SAPI_CGI_PATH)')
case $host_alias in
*aix*)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?view=markuprev=1.1
Index: php-src/sapi/cgi/fastcgi.c
+++ php-src/sapi/cgi/fastcgi.c
[PHP-CVS] cvs: php-src /sapi/cgi config9.m4 /sapi/cli config.m4
dmitry Thu Feb 2 10:00:09 2006 UTC
Modified files:
/php-src/sapi/cgi config9.m4
/php-src/sapi/cli config.m4
Log:
AIX support
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config9.m4?r1=1.20r2=1.21diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.20 php-src/sapi/cgi/config9.m4:1.21
--- php-src/sapi/cgi/config9.m4:1.20Thu Dec 29 14:12:34 2005
+++ php-src/sapi/cgi/config9.m4 Thu Feb 2 10:00:09 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.20 2005/12/29 14:12:34 tony2001 Exp $
+dnl $Id: config9.m4,v 1.21 2006/02/02 10:00:09 dmitry Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -89,7 +89,7 @@
case $host_alias in
*aix*)
-BUILD_CGI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \T\) ||
(\$\$2 == \D\) || (\$\$2 == \B\)) (substr(\$\$3,1,1) != \.\)) { print
\$\$3 } }' | sort -u php.sym \$(LIBTOOL) --mode=link \$(CC)
-export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)
+BUILD_CGI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\`
| \$(AWK) '{ if (((\$\$2 == \T\) || (\$\$2 == \D\) || (\$\$2 == \B\))
(substr(\$\$3,1,1) != \.\)) { print \$\$3 } }' | sort -u php.sym
\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl
-Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)
;;
*darwin*)
BUILD_CGI=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/config.m4?r1=1.22r2=1.23diff_format=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.22 php-src/sapi/cli/config.m4:1.23
--- php-src/sapi/cli/config.m4:1.22 Thu Jul 7 05:54:43 2005
+++ php-src/sapi/cli/config.m4 Thu Feb 2 10:00:09 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22 2005/07/07 05:54:43 dmitry Exp $
+dnl $Id: config.m4,v 1.23 2006/02/02 10:00:09 dmitry Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -20,7 +20,7 @@
case $host_alias in
*aix*)
-BUILD_CLI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \T\) ||
(\$\$2 == \D\) || (\$\$2 == \B\)) (substr(\$\$3,1,1) != \.\)) { print
\$\$3 } }' | sort -u php.sym \$(LIBTOOL) --mode=link \$(CC)
-export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)
+BUILD_CLI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` |
\$(AWK) '{ if (((\$\$2 == \T\) || (\$\$2 == \D\) || (\$\$2 == \B\))
(substr(\$\$3,1,1) != \.\)) { print \$\$3 } }' | sort -u php.sym
\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl
-Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)
;;
*darwin*)
BUILD_CLI=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/cgi config9.m4 /sapi/cli config.m4
dmitry Thu Feb 2 09:59:24 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cgi config9.m4
/php-src/sapi/cli config.m4
Log:
AIX support
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config9.m4?r1=1.17.2.1r2=1.17.2.2diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.17.2.1
php-src/sapi/cgi/config9.m4:1.17.2.2
--- php-src/sapi/cgi/config9.m4:1.17.2.1Thu Feb 2 08:17:23 2006
+++ php-src/sapi/cgi/config9.m4 Thu Feb 2 09:59:23 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.17.2.1 2006/02/02 08:17:23 dmitry Exp $
+dnl $Id: config9.m4,v 1.17.2.2 2006/02/02 09:59:23 dmitry Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -150,7 +150,7 @@
case $host_alias in
*aix*)
-BUILD_CGI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \T\) ||
(\$\$2 == \D\) || (\$\$2 == \B\)) (substr(\$\$3,1,1) != \.\)) { print
\$\$3 } }' | sort -u php.sym \$(LIBTOOL) --mode=link \$(CC)
-export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)
+BUILD_CGI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\`
| \$(AWK) '{ if (((\$\$2 == \T\) || (\$\$2 == \D\) || (\$\$2 == \B\))
(substr(\$\$3,1,1) != \.\)) { print \$\$3 } }' | sort -u php.sym
\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl
-Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)
;;
*darwin*)
BUILD_CGI=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/config.m4?r1=1.22r2=1.22.2.1diff_format=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.22 php-src/sapi/cli/config.m4:1.22.2.1
--- php-src/sapi/cli/config.m4:1.22 Thu Jul 7 05:54:43 2005
+++ php-src/sapi/cli/config.m4 Thu Feb 2 09:59:23 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22 2005/07/07 05:54:43 dmitry Exp $
+dnl $Id: config.m4,v 1.22.2.1 2006/02/02 09:59:23 dmitry Exp $
dnl
AC_MSG_CHECKING(for CLI build)
@@ -20,7 +20,7 @@
case $host_alias in
*aix*)
-BUILD_CLI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed
's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \T\) ||
(\$\$2 == \D\) || (\$\$2 == \B\)) (substr(\$\$3,1,1) != \.\)) { print
\$\$3 } }' | sort -u php.sym \$(LIBTOOL) --mode=link \$(CC)
-export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM)
\$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS)
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)
+BUILD_CLI=echo '\#! .' php.sym echo php.sym nm -BCpg \`echo
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` |
\$(AWK) '{ if (((\$\$2 == \T\) || (\$\$2 == \D\) || (\$\$2 == \B\))
(substr(\$\$3,1,1) != \.\)) { print \$\$3 } }' | sort -u php.sym
\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN)
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl
-Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)
;;
*darwin*)
BUILD_CLI=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS)
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS)
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS)
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_encoding.c php_soap.h soap.c /ext/soap/tests/bugs bug36226.phpt
dmitry Thu Feb 2 11:41:45 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/soap/tests/bugsbug36226.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap php_encoding.c php_soap.h soap.c
Log:
Bug #36226 Inconsistent handling when passing potential arrays
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.392r2=1.2027.2.393diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.392 php-src/NEWS:1.2027.2.393
--- php-src/NEWS:1.2027.2.392 Thu Feb 2 08:17:23 2006
+++ php-src/NEWSThu Feb 2 11:41:45 2006
@@ -22,6 +22,8 @@
- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony)
- Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch).
(Tony)
+- Fixed bug #36226 (Inconsistent handling when passing potential arrays).
+ (Dmitry)
- Fixed bug #36224 (date(DATE_ATOM) gives wrong results). (Derick, Hannes
Magnusson)
- Fixed bug #36222 (errorInfo in PDOException is always NULL). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.14r2=1.103.2.15diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.14
php-src/ext/soap/php_encoding.c:1.103.2.15
--- php-src/ext/soap/php_encoding.c:1.103.2.14 Wed Feb 1 17:18:24 2006
+++ php-src/ext/soap/php_encoding.c Thu Feb 2 11:41:45 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.14 2006/02/01 17:18:24 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.15 2006/02/02 11:41:45 dmitry Exp $ */
#include time.h
@@ -1157,6 +1157,14 @@
add_next_index_zval(array, val);
} while ((node =
get_node(node-next, model-u.element-name)) != NULL);
val = array;
+ } else if ((SOAP_GLOBAL(features)
SOAP_SINGLE_ELEMENT_ARRAYS)
+ (model-max_occurs == -1 ||
model-max_occurs 1)) {
+ zval *array;
+
+ MAKE_STD_ZVAL(array);
+ array_init(array);
+ add_next_index_zval(array, val);
+ val = array;
}
set_zval_property(ret,
model-u.element-name, val TSRMLS_CC);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_soap.h?r1=1.38.2.1r2=1.38.2.2diff_format=u
Index: php-src/ext/soap/php_soap.h
diff -u php-src/ext/soap/php_soap.h:1.38.2.1
php-src/ext/soap/php_soap.h:1.38.2.2
--- php-src/ext/soap/php_soap.h:1.38.2.1Sun Jan 1 12:50:13 2006
+++ php-src/ext/soap/php_soap.h Thu Feb 2 11:41:45 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_soap.h,v 1.38.2.1 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: php_soap.h,v 1.38.2.2 2006/02/02 11:41:45 dmitry Exp $ */
#ifndef PHP_SOAP_H
#define PHP_SOAP_H
@@ -119,6 +119,7 @@
char *uri;
xmlCharEncodingHandlerPtr encoding;
HashTable *class_map;
+ intfeatures;
};
#define SOAP_CLASS 1
@@ -151,6 +152,8 @@
#define SOAP_AUTHENTICATION_BASIC 0
#define SOAP_AUTHENTICATION_DIGEST 1
+#define SOAP_SINGLE_ELEMENT_ARRAYS (10)
+
ZEND_BEGIN_MODULE_GLOBALS(soap)
HashTable defEncNs; /* mapping of default namespaces to prefixes */
HashTable defEnc;
@@ -167,6 +170,7 @@
long cache_ttl;
xmlCharEncodingHandlerPtr encoding;
HashTable *class_map;
+ intfeatures;
ZEND_END_MODULE_GLOBALS(soap)
#ifdef PHP_WIN32
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.11r2=1.156.2.12diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.11 php-src/ext/soap/soap.c:1.156.2.12
--- php-src/ext/soap/soap.c:1.156.2.11 Sun Jan 1 12:50:13 2006
+++ php-src/ext/soap/soap.c Thu Feb 2 11:41:45 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.11 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: soap.c,v 1.156.2.12 2006/02/02 11:41:45 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -479,6 +479,7 @@
SOAP_GLOBAL(soap_version) = SOAP_1_1;
SOAP_GLOBAL(encoding) = NULL;
SOAP_GLOBAL(class_map) = NULL;
+ SOAP_GLOBAL(features) = 0;
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c php_soap.h soap.c /ext/soap/tests/bugs bug36226.phpt
dmitry Thu Feb 2 11:42:12 2006 UTC
Modified files:
/php-src/ext/soap php_encoding.c php_soap.h soap.c
/php-src/ext/soap/tests/bugsbug36226.phpt
Log:
Bug #36226 Inconsistent handling when passing potential arrays
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.118r2=1.119diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.118
php-src/ext/soap/php_encoding.c:1.119
--- php-src/ext/soap/php_encoding.c:1.118 Wed Feb 1 17:18:38 2006
+++ php-src/ext/soap/php_encoding.c Thu Feb 2 11:42:12 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.118 2006/02/01 17:18:38 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.119 2006/02/02 11:42:12 dmitry Exp $ */
#include time.h
@@ -1157,6 +1157,14 @@
add_next_index_zval(array, val);
} while ((node =
get_node(node-next, model-u.element-name)) != NULL);
val = array;
+ } else if ((SOAP_GLOBAL(features)
SOAP_SINGLE_ELEMENT_ARRAYS)
+ (model-max_occurs == -1 ||
model-max_occurs 1)) {
+ zval *array;
+
+ MAKE_STD_ZVAL(array);
+ array_init(array);
+ add_next_index_zval(array, val);
+ val = array;
}
set_zval_property(ret,
model-u.element-name, val TSRMLS_CC);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_soap.h?r1=1.39r2=1.40diff_format=u
Index: php-src/ext/soap/php_soap.h
diff -u php-src/ext/soap/php_soap.h:1.39 php-src/ext/soap/php_soap.h:1.40
--- php-src/ext/soap/php_soap.h:1.39Sun Jan 1 13:09:53 2006
+++ php-src/ext/soap/php_soap.h Thu Feb 2 11:42:12 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_soap.h,v 1.39 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: php_soap.h,v 1.40 2006/02/02 11:42:12 dmitry Exp $ */
#ifndef PHP_SOAP_H
#define PHP_SOAP_H
@@ -119,6 +119,7 @@
char *uri;
xmlCharEncodingHandlerPtr encoding;
HashTable *class_map;
+ intfeatures;
};
#define SOAP_CLASS 1
@@ -151,6 +152,8 @@
#define SOAP_AUTHENTICATION_BASIC 0
#define SOAP_AUTHENTICATION_DIGEST 1
+#define SOAP_SINGLE_ELEMENT_ARRAYS (10)
+
ZEND_BEGIN_MODULE_GLOBALS(soap)
HashTable defEncNs; /* mapping of default namespaces to prefixes */
HashTable defEnc;
@@ -167,6 +170,7 @@
long cache_ttl;
xmlCharEncodingHandlerPtr encoding;
HashTable *class_map;
+ intfeatures;
ZEND_END_MODULE_GLOBALS(soap)
#ifdef PHP_WIN32
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.169r2=1.170diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.169 php-src/ext/soap/soap.c:1.170
--- php-src/ext/soap/soap.c:1.169 Sun Jan 1 13:09:54 2006
+++ php-src/ext/soap/soap.c Thu Feb 2 11:42:12 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.169 2006/01/01 13:09:54 sniper Exp $ */
+/* $Id: soap.c,v 1.170 2006/02/02 11:42:12 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -479,6 +479,7 @@
SOAP_GLOBAL(soap_version) = SOAP_1_1;
SOAP_GLOBAL(encoding) = NULL;
SOAP_GLOBAL(class_map) = NULL;
+ SOAP_GLOBAL(features) = 0;
return SUCCESS;
}
@@ -633,6 +634,8 @@
REGISTER_STRING_CONSTANT(XSD_NAMESPACE, XSD_NAMESPACE, CONST_CS |
CONST_PERSISTENT);
REGISTER_STRING_CONSTANT(XSD_1999_NAMESPACE, XSD_1999_NAMESPACE,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SOAP_SINGLE_ELEMENT_ARRAYS,
SOAP_SINGLE_ELEMENT_ARRAYS, CONST_CS | CONST_PERSISTENT);
+
old_error_handler = zend_error_cb;
zend_error_cb = soap_error_handler;
@@ -957,6 +960,11 @@
zend_hash_copy(service-class_map, (*tmp)-value.ht,
(copy_ctor_func_t) zval_add_ref, (void *) ztmp, sizeof(zval *));
}
+ if (zend_hash_find(ht, features, sizeof(features),
(void**)tmp) == SUCCESS
+ Z_TYPE_PP(tmp) == IS_LONG) {
+ service-features = Z_LVAL_PP(tmp);
+ }
+
}
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/spl spl_directory.c
tony2001Thu Feb 2 12:19:14 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/ext/splspl_directory.c Log: fix #36258 (SplFileObject::getPath() may lead to segfault) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.393r2=1.2027.2.394diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.393 php-src/NEWS:1.2027.2.394 --- php-src/NEWS:1.2027.2.393 Thu Feb 2 11:41:45 2006 +++ php-src/NEWSThu Feb 2 12:19:13 2006 @@ -19,6 +19,7 @@ - Added imap_savebody() that allows message body to be written to a file. (Mike) - Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE on error. (Pierre) +- Fixed bug #36258 (SplFileObject::getPath() may lead to segfault). (Tony) - Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony) - Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch). (Tony) http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.13r2=1.45.2.14diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.45.2.13 php-src/ext/spl/spl_directory.c:1.45.2.14 --- php-src/ext/spl/spl_directory.c:1.45.2.13 Mon Jan 23 15:24:10 2006 +++ php-src/ext/spl/spl_directory.c Thu Feb 2 12:19:14 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_directory.c,v 1.45.2.13 2006/01/23 15:24:10 iliaa Exp $ */ +/* $Id: spl_directory.c,v 1.45.2.14 2006/02/02 12:19:14 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -340,6 +340,8 @@ spl_filesystem_object_get_file_name(source TSRMLS_CC); intern-file_name = estrndup(source-file_name, source-file_name_len); intern-file_name_len = source-file_name_len; + intern-path = estrndup(source-path, source-path_len); + intern-path_len = source-path_len; break; case SPL_FS_FILE: return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce : source-file_class, intern TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
tony2001Thu Feb 2 12:20:26 2006 UTC Modified files: /php-src/ext/splspl_directory.c Log: MF51: fix #36258 (SplFileObject::getPath() may lead to segfault) http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.66r2=1.67diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.66 php-src/ext/spl/spl_directory.c:1.67 --- php-src/ext/spl/spl_directory.c:1.66Mon Jan 23 15:24:41 2006 +++ php-src/ext/spl/spl_directory.c Thu Feb 2 12:20:26 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_directory.c,v 1.66 2006/01/23 15:24:41 iliaa Exp $ */ +/* $Id: spl_directory.c,v 1.67 2006/02/02 12:20:26 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -340,6 +340,8 @@ spl_filesystem_object_get_file_name(source TSRMLS_CC); intern-file_name = estrndup(source-file_name, source-file_name_len); intern-file_name_len = source-file_name_len; + intern-path = estrndup(source-path, source-path_len); + intern-path_len = source-path_len; break; case SPL_FS_FILE: return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce : source-file_class, intern TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl_directory.c
tony2001Thu Feb 2 12:40:33 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_directory.c
Log:
MFH: add missing folding tags
nuke unnecessary semicolons
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.14r2=1.45.2.15diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.14
php-src/ext/spl/spl_directory.c:1.45.2.15
--- php-src/ext/spl/spl_directory.c:1.45.2.14 Thu Feb 2 12:19:14 2006
+++ php-src/ext/spl/spl_directory.c Thu Feb 2 12:40:33 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.14 2006/02/02 12:19:14 tony2001 Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.15 2006/02/02 12:40:33 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -699,6 +699,7 @@
spl_filesystem_object_create_type(ht, intern, SPL_FS_FILE, NULL,
return_value TSRMLS_CC);
}
+/* }}} */
/* {{{ proto SplFileObject SplFileInfo::setFileClass([string class_name])
Class to use in openFile() */
@@ -713,6 +714,7 @@
intern-file_class = ce;
}
+/* }}} */
/* {{{ proto SplFileObject SplFileInfo::setInfoClass([string class_name])
Class to use in getFileInfo(), getPathInfo(), getSubPathInfo() */
@@ -727,6 +729,7 @@
intern-file_class = ce;
}
+/* }}} */
/* {{{ proto SplFileInfo SplFileInfo::getFileInfo([string $class_name])
Get/copy file info */
@@ -741,6 +744,7 @@
spl_filesystem_object_create_type(ht, intern, SPL_FS_INFO, ce,
return_value TSRMLS_CC);
}
+/* }}} */
/* {{{ proto SplFileInfo SplFileInfo::getPathInfo([string $class_name])
Get/copy file info */
@@ -755,6 +759,7 @@
spl_filesystem_object_create_info(intern, intern-path,
intern-path_len, 1, ce, return_value TSRMLS_CC);
}
+/* }}} */
/* {{{ proto void RecursiveDirectoryIterator::__construct(string path [, int
flags])
Cronstructs a new dir iterator from a path. */
@@ -1199,19 +1204,19 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_info___construct, 0)
ZEND_ARG_INFO(0, file_name)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_info_openFile, 0, 0, 0)
ZEND_ARG_INFO(0, open_mode)
ZEND_ARG_INFO(0, use_include_path)
ZEND_ARG_INFO(0, context)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_info_optinalFileClass, 0, 0, 0)
ZEND_ARG_INFO(0, class_name)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
/* the method table */
/* each method can have its own parameters and visibility */
@@ -1247,7 +1252,7 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_dir___construct, 0)
ZEND_ARG_INFO(0, path)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
/* the method table */
/* each method can have its own parameters and visibility */
@@ -1268,7 +1273,7 @@
ZEND_BEGIN_ARG_INFO(arginfo_r_dir___construct, 0)
ZEND_ARG_INFO(0, path)
ZEND_ARG_INFO(0, flags)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static zend_function_entry spl_RecursiveDirectoryIterator_functions[] = {
SPL_ME(RecursiveDirectoryIterator, __construct,
arginfo_r_dir___construct, ZEND_ACC_PUBLIC)
@@ -1860,61 +1865,61 @@
ZEND_ARG_INFO(0, open_mode)
ZEND_ARG_INFO(0, use_include_path)
ZEND_ARG_INFO(0, context)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_file_object_setFlags, 0)
ZEND_ARG_INFO(0, flags)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_file_object_setMaxLineLen, 0)
ZEND_ARG_INFO(0, max_len)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetcsv, 0, 0, 0)
ZEND_ARG_INFO(0, delimiter)
ZEND_ARG_INFO(0, enclosure)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_flock, 0, 0, 1)
ZEND_ARG_INFO(0, operation)
ZEND_ARG_INFO(1, wouldblock])
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fseek, 0, 0, 1)
ZEND_ARG_INFO(0, pos)
ZEND_ARG_INFO(0, whence)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetss, 0, 0, 0)
ZEND_ARG_INFO(0, allowable_tags)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1)
ZEND_ARG_INFO(0, format)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1)
ZEND_ARG_INFO(0, str)
ZEND_ARG_INFO(0, length)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_ftruncate, 0, 0, 1)
ZEND_ARG_INFO(0, size)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_seek, 0, 0, 1)
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl/tests bug36258.phpt
tony2001Thu Feb 2 13:56:16 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/spl/tests bug36258.phpt Log: add test for bug #36258 http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/bug36258.phpt?view=markuprev=1.1 Index: php-src/ext/spl/tests/bug36258.phpt +++ php-src/ext/spl/tests/bug36258.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests bug36258.phpt
tony2001Thu Feb 2 13:57:04 2006 UTC
Modified files:
/php-src/ext/spl/tests bug36258.phpt
Log:
add test for bug #36258
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/bug36258.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/bug36258.phpt
diff -u /dev/null php-src/ext/spl/tests/bug36258.phpt:1.2
--- /dev/null Thu Feb 2 13:57:04 2006
+++ php-src/ext/spl/tests/bug36258.phpt Thu Feb 2 13:57:04 2006
@@ -0,0 +1,19 @@
+--TEST--
+Bug #36258 (SplFileObject::getPath() may lead to segfault)
+--FILE--
+?php
+
+$diriter = new RecursiveIteratorIterator( new RecursiveDirectoryIterator('.')
);
+
+foreach ($diriter as $key = $file) {
+ var_dump($file-getFilename());
+ var_dump($file-getPath());
+ break;
+}
+
+echo Done\n;
+?
+--EXPECTF--
+string(%d) %s
+string(%d) %s
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/unicode config.w32
tony2001Thu Feb 2 14:45:54 2006 UTC
Modified files:
/php-src/ext/unicodeconfig.w32
Log:
fix win32 snapshots
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/config.w32?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/unicode/config.w32
diff -u php-src/ext/unicode/config.w32:1.3 php-src/ext/unicode/config.w32:1.4
--- php-src/ext/unicode/config.w32:1.3 Sat Aug 13 13:43:31 2005
+++ php-src/ext/unicode/config.w32 Thu Feb 2 14:45:54 2006
@@ -1,8 +1,8 @@
-// $Id: config.w32,v 1.3 2005/08/13 13:43:31 wez Exp $
+// $Id: config.w32,v 1.4 2006/02/02 14:45:54 tony2001 Exp $
// vim:ft=javascript
ARG_ENABLE('unicode' , 'ICU API extension', 'yes');
if (PHP_UNICODE != 'no') {
- EXTENSION(unicode, unicode.c unicode_filter.c locale.c);
+ EXTENSION(unicode, unicode.c unicode_filter.c unicode_iterators.c
locale.c);
AC_DEFINE('HAVE_UNICODE', 1, 'ICU API extension');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib/tests gzreadgzwrite.phpt gzreadgzwriteplain.phpt
tony2001Thu Feb 2 15:04:22 2006 UTC
Modified files:
/php-src/ext/zlib/tests gzreadgzwrite.phpt gzreadgzwriteplain.phpt
Log:
fix tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/tests/gzreadgzwrite.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/zlib/tests/gzreadgzwrite.phpt
diff -u php-src/ext/zlib/tests/gzreadgzwrite.phpt:1.3
php-src/ext/zlib/tests/gzreadgzwrite.phpt:1.4
--- php-src/ext/zlib/tests/gzreadgzwrite.phpt:1.3 Wed May 19 08:45:23 2004
+++ php-src/ext/zlib/tests/gzreadgzwrite.phpt Thu Feb 2 15:04:22 2006
@@ -15,7 +15,12 @@
fclose($fp);
$fp = gzopen($filename, rb);
-$data = gzread($fp, strlen($original));
+
+$data = '';
+while ($buf = gzread($fp, 8092)) {
+ $data .= $buf;
+}
+
if ($data == $original) {
echo Strings are equal\n;
} else {
http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/tests/gzreadgzwriteplain.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/zlib/tests/gzreadgzwriteplain.phpt
diff -u php-src/ext/zlib/tests/gzreadgzwriteplain.phpt:1.3
php-src/ext/zlib/tests/gzreadgzwriteplain.phpt:1.4
--- php-src/ext/zlib/tests/gzreadgzwriteplain.phpt:1.3 Wed May 19 08:45:23 2004
+++ php-src/ext/zlib/tests/gzreadgzwriteplain.phpt Thu Feb 2 15:04:22 2006
@@ -15,7 +15,12 @@
fclose($fp);
$fp = gzopen($filename, rb);
-$data = gzread($fp, strlen($original));
+
+$data = '';
+while ($buf = gzread($fp, 8192)) {
+ $data .= $buf;
+}
+
if ($data == $original) {
echo Strings are equal\n;
} else {
@@ -24,7 +29,11 @@
}
gzseek($fp, strlen($original) / 2);
-$data = gzread($fp, strlen($original));
+
+$data = '';
+while ($buf = gzread($fp, 8192)) {
+ $data .= $buf;
+}
var_dump(strlen($data));
if ($data == substr($original, strlen($original) / 2)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl_directory.c
iliaa Thu Feb 2 15:10:04 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_directory.c
Log:
Only use win32 directory separators on win32 or netware.
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.15r2=1.45.2.16diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.15
php-src/ext/spl/spl_directory.c:1.45.2.16
--- php-src/ext/spl/spl_directory.c:1.45.2.15 Thu Feb 2 12:40:33 2006
+++ php-src/ext/spl/spl_directory.c Thu Feb 2 15:10:04 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.15 2006/02/02 12:40:33 tony2001 Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.16 2006/02/02 15:10:04 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -176,7 +176,11 @@
intern-path_len = strlen(path);
intern-u.dir.dirp = php_stream_opendir(path,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
- if (intern-path_len (path[intern-path_len-1] == '/' ||
path[intern-path_len-1] == '\\')) {
+ if (intern-path_len (path[intern-path_len-1] == '/'
+#if defined(PHP_WIN32) || defined(NETWARE)
+ || path[intern-path_len-1] == '\\'
+#endif
+ )) {
intern-path = estrndup(path, --intern-path_len);
} else {
intern-path = estrndup(path, intern-path_len);
@@ -279,7 +283,11 @@
intern-file_name_len = len;
p1 = strrchr(path, '/');
+#if defined(PHP_WIN32) || defined(NETWARE)
p2 = strrchr(path, '\\');
+#else
+ p2 = 0;
+#endif
if (p1 || p2) {
intern-path_len = (p1 p2 ? p1 : p2) - path;
} else {
@@ -1397,7 +1405,11 @@
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) ==
SUCCESS) {
p1 = strrchr(intern-file_name, '/');
- p2 = strrchr(intern-file_name, '\\');
+#if defined(PHP_WIN32) || defined(NETWARE)
+ p2 = strrchr(path, '\\');
+#else
+ p2 = 0;
+#endif
if (p1 || p2) {
intern-path_len = (p1 p2 ? p1 : p2) -
intern-file_name;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
iliaa Thu Feb 2 15:10:23 2006 UTC
Modified files:
/php-src/ext/splspl_directory.c
Log:
MFB51: Only use win32 directory separators on win32 or netware.
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.68r2=1.69diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.68
php-src/ext/spl/spl_directory.c:1.69
--- php-src/ext/spl/spl_directory.c:1.68Thu Feb 2 12:40:07 2006
+++ php-src/ext/spl/spl_directory.c Thu Feb 2 15:10:23 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.68 2006/02/02 12:40:07 tony2001 Exp $ */
+/* $Id: spl_directory.c,v 1.69 2006/02/02 15:10:23 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -176,7 +176,11 @@
intern-path_len = strlen(path);
intern-u.dir.dirp = php_stream_opendir(path,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
- if (intern-path_len (path[intern-path_len-1] == '/' ||
path[intern-path_len-1] == '\\')) {
+ if (intern-path_len (path[intern-path_len-1] == '/'
+#if defined(PHP_WIN32) || defined(NETWARE)
+ || path[intern-path_len-1] == '\\'
+#endif
+ )) {
intern-path = estrndup(path, --intern-path_len);
} else {
intern-path = estrndup(path, intern-path_len);
@@ -279,7 +283,11 @@
intern-file_name_len = len;
p1 = strrchr(path, '/');
+#if defined(PHP_WIN32) || defined(NETWARE)
p2 = strrchr(path, '\\');
+#else
+ p2 = 0;
+#endif
if (p1 || p2) {
intern-path_len = (p1 p2 ? p1 : p2) - path;
} else {
@@ -1393,7 +1401,11 @@
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) ==
SUCCESS) {
p1 = strrchr(intern-file_name, '/');
- p2 = strrchr(intern-file_name, '\\');
+#if defined(PHP_WIN32) || defined(NETWARE)
+ p2 = strrchr(path, '\\');
+#else
+ p2 = 0;
+#endif
if (p1 || p2) {
intern-path_len = (p1 p2 ? p1 : p2) -
intern-file_name;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams xp_socket.c
pollita Thu Feb 2 18:16:25 2006 UTC
Modified files:
/php-src/main/streams xp_socket.c
Log:
Prevent bindport from being used uninitialized
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/xp_socket.c?r1=1.34r2=1.35diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.34
php-src/main/streams/xp_socket.c:1.35
--- php-src/main/streams/xp_socket.c:1.34 Sun Jan 1 13:09:57 2006
+++ php-src/main/streams/xp_socket.cThu Feb 2 18:16:25 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.34 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: xp_socket.c,v 1.35 2006/02/02 18:16:25 pollita Exp $ */
#include php.h
#include ext/standard/file.h
@@ -578,7 +578,7 @@
php_stream_xport_param *xparam TSRMLS_DC)
{
char *host = NULL, *bindto = NULL;
- int portno, bindport;
+ int portno, bindport = 0;
int err;
int ret;
zval **tmpzval = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /main/streams xp_socket.c
pollita Thu Feb 2 18:16:43 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main/streams xp_socket.c
Log:
MFH: Prevent bindport from being used uninitialized
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.1r2=1.33.2.2diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.1
php-src/main/streams/xp_socket.c:1.33.2.2
--- php-src/main/streams/xp_socket.c:1.33.2.1 Sun Jan 1 12:50:18 2006
+++ php-src/main/streams/xp_socket.cThu Feb 2 18:16:43 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.33.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2 2006/02/02 18:16:43 pollita Exp $ */
#include php.h
#include ext/standard/file.h
@@ -578,7 +578,7 @@
php_stream_xport_param *xparam TSRMLS_DC)
{
char *host = NULL, *bindto = NULL;
- int portno, bindport;
+ int portno, bindport = 0;
int err;
int ret;
zval **tmpzval = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
helly Thu Feb 2 19:02:05 2006 UTC
Modified files:
/php-src/ext/splspl_directory.c
Log:
- Fix oversight
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.69r2=1.70diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.69
php-src/ext/spl/spl_directory.c:1.70
--- php-src/ext/spl/spl_directory.c:1.69Thu Feb 2 15:10:23 2006
+++ php-src/ext/spl/spl_directory.c Thu Feb 2 19:02:05 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.69 2006/02/02 15:10:23 iliaa Exp $ */
+/* $Id: spl_directory.c,v 1.70 2006/02/02 19:02:05 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1402,7 +1402,7 @@
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) ==
SUCCESS) {
p1 = strrchr(intern-file_name, '/');
#if defined(PHP_WIN32) || defined(NETWARE)
- p2 = strrchr(path, '\\');
+ p2 = strrchr(intern-file_name, '\\');
#else
p2 = 0;
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/xml xml.c
tony2001Thu Feb 2 21:43:09 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/xmlxml.c
Log:
nuke unused variable
http://cvs.php.net/viewcvs.cgi/php-src/ext/xml/xml.c?r1=1.157.2.3r2=1.157.2.4diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.157.2.3 php-src/ext/xml/xml.c:1.157.2.4
--- php-src/ext/xml/xml.c:1.157.2.3 Sun Jan 1 12:50:16 2006
+++ php-src/ext/xml/xml.c Thu Feb 2 21:43:09 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.157.2.3 2006/01/01 12:50:16 sniper Exp $ */
+/* $Id: xml.c,v 1.157.2.4 2006/02/02 21:43:09 tony2001 Exp $ */
#define IS_EXT_MODULE
@@ -1358,9 +1358,8 @@
{
xml_parser *parser;
zval **pind, **data, **xdata, **info = 0;
- int argc, ret;
+ int ret;
- argc = ZEND_NUM_ARGS();
if (zend_get_parameters_ex(4, pind, data, xdata,info) == SUCCESS) {
zval_dtor(*info);
array_init(*info);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml xml.c
tony2001Thu Feb 2 21:43:40 2006 UTC
Modified files:
/php-src/ext/xmlxml.c
Log:
MF51: nuke unused variable
http://cvs.php.net/viewcvs.cgi/php-src/ext/xml/xml.c?r1=1.162r2=1.163diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.162 php-src/ext/xml/xml.c:1.163
--- php-src/ext/xml/xml.c:1.162 Tue Jan 17 12:18:53 2006
+++ php-src/ext/xml/xml.c Thu Feb 2 21:43:40 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.162 2006/01/17 12:18:53 dmitry Exp $ */
+/* $Id: xml.c,v 1.163 2006/02/02 21:43:40 tony2001 Exp $ */
#define IS_EXT_MODULE
@@ -1360,9 +1360,8 @@
{
xml_parser *parser;
zval **pind, **data, **xdata, **info = 0;
- int argc, ret;
+ int ret;
- argc = ZEND_NUM_ARGS();
if (zend_get_parameters_ex(4, pind, data, xdata,info) == SUCCESS) {
zval_dtor(*info);
array_init(*info);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_array.c
helly Thu Feb 2 22:11:49 2006 UTC
Modified files:
/php-src/ext/splspl_array.c
Log:
- Fix ArrayIterator::seek() edge cases
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.89r2=1.90diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.89 php-src/ext/spl/spl_array.c:1.90
--- php-src/ext/spl/spl_array.c:1.89Tue Jan 17 12:18:52 2006
+++ php-src/ext/spl/spl_array.c Thu Feb 2 22:11:49 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.89 2006/01/17 12:18:52 dmitry Exp $ */
+/* $Id: spl_array.c,v 1.90 2006/02/02 22:11:49 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1006,15 +1006,12 @@
if (position = 0) { /* negative values are not supported */
zend_hash_internal_pointer_reset_ex(aht, intern-pos);
+ result = SUCCESS;
while (position-- 0 (result = spl_array_next(intern
TSRMLS_CC)) == SUCCESS);
- if (intern-pos (intern-ar_flags SPL_ARRAY_IS_REF)
spl_hash_verify_pos(intern TSRMLS_CC) == FAILURE) {
- /* fail */
- } else {
- if (zend_hash_has_more_elements_ex(aht, intern-pos)
== SUCCESS) {
- return; /* ok */
- }
+ if (result == SUCCESS zend_hash_has_more_elements_ex(aht,
intern-pos) == SUCCESS) {
+ return; /* ok */
}
}
zend_throw_exception_ex(U_CLASS_ENTRY(spl_ce_OutOfBoundsException), 0
TSRMLS_CC, Seek position %ld is out of range, opos);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl_array.c
helly Thu Feb 2 22:17:42 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_array.c
Log:
- MFH Fix ArrayIterator::seek() edge cases
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.7r2=1.71.2.8diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.7
php-src/ext/spl/spl_array.c:1.71.2.8
--- php-src/ext/spl/spl_array.c:1.71.2.7Sun Jan 1 12:50:13 2006
+++ php-src/ext/spl/spl_array.c Thu Feb 2 22:17:42 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.7 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: spl_array.c,v 1.71.2.8 2006/02/02 22:17:42 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -999,15 +999,12 @@
if (position = 0) { /* negative values are not supported */
zend_hash_internal_pointer_reset_ex(aht, intern-pos);
+ result = SUCCESS;
while (position-- 0 (result = spl_array_next(intern
TSRMLS_CC)) == SUCCESS);
- if (intern-pos (intern-ar_flags SPL_ARRAY_IS_REF)
spl_hash_verify_pos(intern TSRMLS_CC) == FAILURE) {
- /* fail */
- } else {
- if (zend_hash_has_more_elements_ex(aht, intern-pos)
== SUCCESS) {
- return; /* ok */
- }
+ if (result == SUCCESS zend_hash_has_more_elements_ex(aht,
intern-pos) == SUCCESS) {
+ return; /* ok */
}
}
zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, Seek
position %ld is out of range, opos);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
