[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Mar 10 20:33:45 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.192 ZendEngine2/ChangeLog:1.193 --- ZendEngine2/ChangeLog:1.192 Sun Mar 9 20:32:59 2003 +++ ZendEngine2/ChangeLog Mon Mar 10 20:33:44 2003 @@ -1,3 +1,18 @@ +2003-03-10 Zeev Suraski [EMAIL PROTECTED] + +* zend_compile.c: + Clean redundant code + +2003-03-10 Jani Taskinen [EMAIL PROTECTED] + +* zend_compile.c: + Fixed some leaks. Patch by Moriyoshi + +2003-03-10 Shane Caraveo [EMAIL PROTECTED] + +* zend_config.w32.h: + fix isinf for win32 + 2003-03-09 Zeev Suraski [EMAIL PROTECTED] * zend_language_parser.y: @@ -716,7 +731,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.192 2003/03/10 01:32:59 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.193 2003/03/11 01:33:44 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php4(PHP_4_3) /ext/pfpro php_pfpro.h /ext/skeleton php_skeleton.h /ext/yaz php_yaz.h /ext/zlib php_zlib.h /main php_globals.h
ddhill Mon Mar 10 08:35:21 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/pfpro php_pfpro.h /php4/ext/skeleton php_skeleton.h /php4/ext/yaz php_yaz.h /php4/ext/zlib php_zlib.h /php4/main php_globals.h Log: 64-bit corrections to parameters to OnUpdateInt Bug #20994 (Dave) @64-bit corrections to parameters to OnUpdateInt Bug #20994 (Dave) Index: php4/ext/pfpro/php_pfpro.h diff -u php4/ext/pfpro/php_pfpro.h:1.12.2.1 php4/ext/pfpro/php_pfpro.h:1.12.2.2 --- php4/ext/pfpro/php_pfpro.h:1.12.2.1 Tue Dec 31 11:35:12 2002 +++ php4/ext/pfpro/php_pfpro.h Mon Mar 10 08:35:20 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_pfpro.h,v 1.12.2.1 2002/12/31 16:35:12 sebastian Exp $ */ +/* $Id: php_pfpro.h,v 1.12.2.2 2003/03/10 13:35:20 ddhill Exp $ */ #ifndef PHP_PFPRO_H #define PHP_PFPRO_H @@ -54,10 +54,10 @@ ZEND_BEGIN_MODULE_GLOBALS(pfpro) int initialized; char *defaulthost; - int defaultport; - int defaulttimeout; + long defaultport; + long defaulttimeout; char *proxyaddress; - int proxyport; + long proxyport; char *proxylogon; char *proxypassword; ZEND_END_MODULE_GLOBALS(pfpro) Index: php4/ext/skeleton/php_skeleton.h diff -u php4/ext/skeleton/php_skeleton.h:1.18 php4/ext/skeleton/php_skeleton.h:1.18.4.1 --- php4/ext/skeleton/php_skeleton.h:1.18 Thu Apr 11 01:06:16 2002 +++ php4/ext/skeleton/php_skeleton.hMon Mar 10 08:35:20 2003 @@ -30,7 +30,7 @@ and END macros here: ZEND_BEGIN_MODULE_GLOBALS(extname) - int global_value; + long global_value; char *global_string; ZEND_END_MODULE_GLOBALS(extname) */ Index: php4/ext/yaz/php_yaz.h diff -u php4/ext/yaz/php_yaz.h:1.13.4.1 php4/ext/yaz/php_yaz.h:1.13.4.2 --- php4/ext/yaz/php_yaz.h:1.13.4.1 Tue Dec 31 11:35:46 2002 +++ php4/ext/yaz/php_yaz.h Mon Mar 10 08:35:21 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_yaz.h,v 1.13.4.1 2002/12/31 16:35:46 sebastian Exp $ */ +/* $Id: php_yaz.h,v 1.13.4.2 2003/03/10 13:35:21 ddhill Exp $ */ #ifndef PHP_YAZ_H #define PHP_YAZ_H @@ -55,7 +55,7 @@ ZEND_BEGIN_MODULE_GLOBALS(yaz) int assoc_seq; -int max_links; +long max_links; char *log_file; ZEND_END_MODULE_GLOBALS(yaz) Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.32.4.4 php4/ext/zlib/php_zlib.h:1.32.4.5 --- php4/ext/zlib/php_zlib.h:1.32.4.4 Mon Feb 10 21:26:37 2003 +++ php4/ext/zlib/php_zlib.hMon Mar 10 08:35:21 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_zlib.h,v 1.32.4.4 2003/02/11 02:26:37 moriyoshi Exp $ */ +/* $Id: php_zlib.h,v 1.32.4.5 2003/03/10 13:35:21 ddhill Exp $ */ #ifndef PHP_ZLIB_H #define PHP_ZLIB_H @@ -31,8 +31,8 @@ uLong crc; int ob_gzhandler_status; int ob_gzip_coding; - int output_compression; - int output_compression_level; + long output_compression; + long output_compression_level; char *output_handler; ZEND_END_MODULE_GLOBALS(zlib) Index: php4/main/php_globals.h diff -u php4/main/php_globals.h:1.84.2.2 php4/main/php_globals.h:1.84.2.3 --- php4/main/php_globals.h:1.84.2.2Tue Dec 31 11:26:15 2002 +++ php4/main/php_globals.h Mon Mar 10 08:35:21 2003 @@ -57,7 +57,7 @@ zend_bool allow_call_time_pass_reference; zend_bool implicit_flush; - int output_buffering; + long output_buffering; char *safe_mode_include_dir; zend_bool safe_mode_gid; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Mon Mar 10 09:10:30 2003 EDT Modified files: /php4 NEWS Log: this is in the 4_3 branch Index: php4/NEWS diff -u php4/NEWS:1.1369 php4/NEWS:1.1370 --- php4/NEWS:1.1369Fri Mar 7 20:31:50 2003 +++ php4/NEWS Mon Mar 10 09:10:30 2003 @@ -1,7 +1,6 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- 64-bit correction to variables passed to zend_parse_parameters (Dave) - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Fixed bug #21600 (Assign by reference function call changes variable contents). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / acinclude.m4 configure.in
sniper Mon Mar 10 09:32:48 2003 EDT Modified files: /php4 acinclude.m4 configure.in Log: - Always use the shtool mkdir. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.229 php4/acinclude.m4:1.230 --- php4/acinclude.m4:1.229 Wed Mar 5 17:00:45 2003 +++ php4/acinclude.m4 Mon Mar 10 09:32:47 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.229 2003/03/05 22:00:45 sas Exp $ +dnl $Id: acinclude.m4,v 1.230 2003/03/10 14:32:47 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -28,7 +28,7 @@ dnl PHP_INIT_BUILD_SYSTEM dnl AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[ -mkdir include /dev/null 21 +$php_shtool mkdir include Makefile.objects Makefile.fragments dnl We need to play tricks here to avoid matching the grep line itself @@ -660,21 +660,6 @@ AC_SUBST($1) ]) -AC_DEFUN([PHP_MKDIR_P_CHECK],[ - AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[ -test -d conftestdir rm -rf conftestdir -mkdir -p conftestdir/somedir /dev/null 21 -dnl `mkdir -p' must be quiet about creating existing directories -mkdir -p conftestdir/somedir /dev/null 21 -if test $? = 0 test -d conftestdir/somedir; then - ac_cv_mkdir_p=yes -else - ac_cv_mkdir_p=no -fi -rm -rf conftestdir - ]) -]) - AC_DEFUN([PHP_TM_GMTOFF],[ AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, [AC_TRY_COMPILE([#include sys/types.h @@ -1267,10 +1252,7 @@ ]) AC_DEFUN([PHP_GEN_BUILD_DIRS],[ - PHP_MKDIR_P_CHECK - if test $ac_cv_mkdir_p = yes; then -mkdir -p $BUILD_DIR - fi + $php_shtool mkdir -p $BUILD_DIR ]) dnl Index: php4/configure.in diff -u php4/configure.in:1.429 php4/configure.in:1.430 --- php4/configure.in:1.429 Fri Mar 7 01:18:17 2003 +++ php4/configure.in Mon Mar 10 09:32:47 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.429 2003/03/07 06:18:17 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.430 2003/03/10 14:32:47 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -87,12 +87,12 @@ cwd=`pwd` -PHP_INIT_BUILD_SYSTEM - php_shtool=$srcdir/build/shtool T_MD=`$php_shtool echo -n -e %B` T_ME=`$php_shtool echo -n -e %b` +PHP_INIT_BUILD_SYSTEM + dnl We want this one before the checks, so the checks can modify CFLAGS. test -z $CFLAGS auto_cflags=1 @@ -1183,10 +1183,10 @@ # Create configuration headers # -test -d TSRM || mkdir TSRM +test -d TSRM || $php_shtool mkdir TSRM echo '#include ../main/php_config.h' TSRM/tsrm_config.h -test -d Zend || mkdir Zend +test -d Zend || $php_shtool mkdir Zend cat Zend/zend_config.h FEO #include ../main/php_config.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4 configure.in
sniper Mon Mar 10 09:33:10 2003 EDT Modified files: (Branch: PHP_4_3) /php4 acinclude.m4 configure.in Log: - MFH: use shtool mkdir always. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.218.2.8 php4/acinclude.m4:1.218.2.9 --- php4/acinclude.m4:1.218.2.8 Mon Feb 24 10:12:11 2003 +++ php4/acinclude.m4 Mon Mar 10 09:33:10 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.8 2003/02/24 15:12:11 sniper Exp $ +dnl $Id: acinclude.m4,v 1.218.2.9 2003/03/10 14:33:10 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -28,7 +28,7 @@ dnl PHP_INIT_BUILD_SYSTEM dnl AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[ -mkdir include /dev/null 21 +$php_shtool mkdir include Makefile.objects Makefile.fragments dnl We need to play tricks here to avoid matching the egrep line itself @@ -667,21 +667,6 @@ AC_SUBST($1) ]) -AC_DEFUN([PHP_MKDIR_P_CHECK],[ - AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[ -test -d conftestdir rm -rf conftestdir -mkdir -p conftestdir/somedir /dev/null 21 -dnl `mkdir -p' must be quiet about creating existing directories -mkdir -p conftestdir/somedir /dev/null 21 -if test $? = 0 test -d conftestdir/somedir; then - ac_cv_mkdir_p=yes -else - ac_cv_mkdir_p=no -fi -rm -rf conftestdir - ]) -]) - AC_DEFUN([PHP_TM_GMTOFF],[ AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, [AC_TRY_COMPILE([#include sys/types.h @@ -1274,10 +1259,7 @@ ]) AC_DEFUN([PHP_GEN_BUILD_DIRS],[ - PHP_MKDIR_P_CHECK - if test $ac_cv_mkdir_p = yes; then -mkdir -p $BUILD_DIR - fi + $php_shtool mkdir -p $BUILD_DIR ]) dnl Index: php4/configure.in diff -u php4/configure.in:1.396.2.37 php4/configure.in:1.396.2.38 --- php4/configure.in:1.396.2.37Fri Mar 7 01:18:27 2003 +++ php4/configure.in Mon Mar 10 09:33:10 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.37 2003/03/07 06:18:27 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.38 2003/03/10 14:33:10 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -87,12 +87,12 @@ cwd=`pwd` -PHP_INIT_BUILD_SYSTEM - php_shtool=$srcdir/build/shtool T_MD=`$php_shtool echo -n -e %B` T_ME=`$php_shtool echo -n -e %b` +PHP_INIT_BUILD_SYSTEM + dnl We want this one before the checks, so the checks can modify CFLAGS. test -z $CFLAGS auto_cflags=1 @@ -1177,10 +1177,10 @@ # Create configuration headers # -test -d TSRM || mkdir TSRM +test -d TSRM || $php_shtool mkdir TSRM echo '#include ../main/php_config.h' TSRM/tsrm_config.h -test -d Zend || mkdir Zend +test -d Zend || $php_shtool mkdir Zend cat Zend/zend_config.h FEO #include ../main/php_config.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
andrei Mon Mar 10 09:42:08 2003 EDT Modified files: /CVSROOTavail Log: Give Steph access to php-gtk-web. Index: CVSROOT/avail diff -u CVSROOT/avail:1.604 CVSROOT/avail:1.605 --- CVSROOT/avail:1.604 Thu Mar 6 02:24:16 2003 +++ CVSROOT/avail Mon Mar 10 09:42:07 2003 @@ -67,7 +67,7 @@ # The PHP-GTK Web Group has access to the PHP-GTK website. -avail|fmk,jmoore,cmv,alan_k|php-gtk-web +avail|fmk,jmoore,cmv,alan_k,sfox|php-gtk-web # The Smarty Group has access to the Smarty code -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / acinclude.m4 configure.in
On Mon, 10 Mar 2003, Sascha Schumann wrote: On Mon, 10 Mar 2003, Jani Taskinen wrote: sniper Mon Mar 10 09:32:48 2003 EDT Modified files: /php4acinclude.m4 configure.in Log: - Always use the shtool mkdir. This commit is pointless - it does not address any problems nor does it add any functionality. See bug #22556 for one problem. And I did ask about this, you never bothered to reply. Please revert. No way, it's better to use the shtool mkdir which works everywhere. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pfpro php_pfpro.h /ext/skeleton php_skeleton.h /ext/yaz php_yaz.h /ext/zlib php_zlib.h /main php_globals.h
ddhill Mon Mar 10 09:50:14 2003 EDT Modified files: /php4/ext/pfpro php_pfpro.h /php4/ext/skeleton php_skeleton.h /php4/ext/yaz php_yaz.h /php4/ext/zlib php_zlib.h /php4/main php_globals.h Log: 64 bit corrections to parameters to OnUpdateInt Bug #20994 (Dave) Index: php4/ext/pfpro/php_pfpro.h diff -u php4/ext/pfpro/php_pfpro.h:1.13 php4/ext/pfpro/php_pfpro.h:1.14 --- php4/ext/pfpro/php_pfpro.h:1.13 Tue Dec 31 11:07:16 2002 +++ php4/ext/pfpro/php_pfpro.h Mon Mar 10 09:50:14 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_pfpro.h,v 1.13 2002/12/31 16:07:16 sebastian Exp $ */ +/* $Id: php_pfpro.h,v 1.14 2003/03/10 14:50:14 ddhill Exp $ */ #ifndef PHP_PFPRO_H #define PHP_PFPRO_H @@ -54,10 +54,10 @@ ZEND_BEGIN_MODULE_GLOBALS(pfpro) int initialized; char *defaulthost; - int defaultport; - int defaulttimeout; + long defaultport; + long defaulttimeout; char *proxyaddress; - int proxyport; + long proxyport; char *proxylogon; char *proxypassword; ZEND_END_MODULE_GLOBALS(pfpro) Index: php4/ext/skeleton/php_skeleton.h diff -u php4/ext/skeleton/php_skeleton.h:1.18 php4/ext/skeleton/php_skeleton.h:1.19 --- php4/ext/skeleton/php_skeleton.h:1.18 Thu Apr 11 01:06:16 2002 +++ php4/ext/skeleton/php_skeleton.hMon Mar 10 09:50:14 2003 @@ -30,7 +30,7 @@ and END macros here: ZEND_BEGIN_MODULE_GLOBALS(extname) - int global_value; + long global_value; char *global_string; ZEND_END_MODULE_GLOBALS(extname) */ Index: php4/ext/yaz/php_yaz.h diff -u php4/ext/yaz/php_yaz.h:1.16 php4/ext/yaz/php_yaz.h:1.17 --- php4/ext/yaz/php_yaz.h:1.16 Fri Feb 28 01:33:03 2003 +++ php4/ext/yaz/php_yaz.h Mon Mar 10 09:50:14 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_yaz.h,v 1.16 2003/02/28 06:33:03 sniper Exp $ */ +/* $Id: php_yaz.h,v 1.17 2003/03/10 14:50:14 ddhill Exp $ */ #ifndef PHP_YAZ_H #define PHP_YAZ_H @@ -57,7 +57,7 @@ ZEND_BEGIN_MODULE_GLOBALS(yaz) int assoc_seq; - int max_links; + long max_links; char *log_file; ZEND_END_MODULE_GLOBALS(yaz) Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.36 php4/ext/zlib/php_zlib.h:1.37 --- php4/ext/zlib/php_zlib.h:1.36 Mon Feb 10 14:04:40 2003 +++ php4/ext/zlib/php_zlib.hMon Mar 10 09:50:14 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_zlib.h,v 1.36 2003/02/10 19:04:40 moriyoshi Exp $ */ +/* $Id: php_zlib.h,v 1.37 2003/03/10 14:50:14 ddhill Exp $ */ #ifndef PHP_ZLIB_H #define PHP_ZLIB_H @@ -31,8 +31,8 @@ uLong crc; int ob_gzhandler_status; int ob_gzip_coding; - int output_compression; - int output_compression_level; + long output_compression; + long output_compression_level; char *output_handler; ZEND_END_MODULE_GLOBALS(zlib) Index: php4/main/php_globals.h diff -u php4/main/php_globals.h:1.89 php4/main/php_globals.h:1.90 --- php4/main/php_globals.h:1.89Sun Mar 2 05:19:15 2003 +++ php4/main/php_globals.h Mon Mar 10 09:50:14 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_globals.h,v 1.89 2003/03/02 10:19:15 zeev Exp $ */ +/* $Id: php_globals.h,v 1.90 2003/03/10 14:50:14 ddhill Exp $ */ #ifndef PHP_GLOBALS_H #define PHP_GLOBALS_H @@ -59,7 +59,7 @@ zend_bool allow_call_time_pass_reference; zend_bool implicit_flush; - int output_buffering; + long output_buffering; char *safe_mode_include_dir; zend_bool safe_mode_gid; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / acinclude.m4 configure.in
See bug #22556 for one problem. You should reference fixed bugs in the commit message. In this case, instead of addressing the core issue, you threw the baby out with the bath water. I'll look into fixing it later. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard var.c
andrei Mon Mar 10 10:13:33 2003 EDT
Modified files:
/php4/ext/standard var.c
Log:
Print the object handle (it's useful).
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.157 php4/ext/standard/var.c:1.158
--- php4/ext/standard/var.c:1.157 Fri Jan 31 22:52:31 2003
+++ php4/ext/standard/var.c Mon Mar 10 10:13:32 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.157 2003/02/01 03:52:31 wez Exp $ */
+/* $Id: var.c,v 1.158 2003/03/10 15:13:32 andrei Exp $ */
/* {{{ includes
@@ -101,7 +101,7 @@
Z_OBJ_HANDLER(**struc, get_class_name)(*struc, class_name,
class_name_len, 0 TSRMLS_CC);
- php_printf(%sobject(%s)(%d) {\n, COMMON, class_name, myht ?
zend_hash_num_elements(myht) : 0);
+ php_printf(%sobject(%s)#%d (%d) {\n, COMMON, class_name,
Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0);
head_done:
if (myht) {
zend_hash_apply_with_arguments(myht, (apply_func_args_t)
php_array_element_dump, 1, level);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/ftp php_ftp.c /ext/sockets sockets.c
ddhill Mon Mar 10 10:52:11 2003 EDT
Modified files:
/php4/ext/ftp php_ftp.c
/php4/ext/sockets sockets.c
Log:
fixing missed int to long with zend_parse_parameters
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.85 php4/ext/ftp/php_ftp.c:1.86
--- php4/ext/ftp/php_ftp.c:1.85 Thu Mar 6 18:07:24 2003
+++ php4/ext/ftp/php_ftp.c Mon Mar 10 10:52:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.85 2003/03/06 23:07:24 ddhill Exp $ */
+/* $Id: php_ftp.c,v 1.86 2003/03/10 15:52:10 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -412,7 +412,8 @@
zval*z_ftp;
ftpbuf_t*ftp;
char*filename;
- int mode, filename_len;
+ int filename_len;
+ longmode;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rls, z_ftp, mode,
filename, filename_len) == FAILURE) {
RETURN_FALSE;
@@ -518,7 +519,8 @@
ftptype_t xtype;
php_stream *stream;
char*file;
- int file_len, mode, resumepos=0;
+ int file_len;
+ longmode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rrsl|l, z_ftp,
z_file, file, file_len, mode, resumepos) == FAILURE) {
return;
@@ -561,7 +563,8 @@
ftptype_t xtype;
php_stream *stream;
char*file;
- int file_len, mode, resumepos=0, ret;
+ int file_len, ret;
+ longmode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rrsl|l, z_ftp,
z_file, file, file_len, mode, resumepos) == FAILURE) {
return;
@@ -630,7 +633,8 @@
ftptype_t xtype;
php_stream *outstream;
char*local, *remote;
- int local_len, remote_len, mode, resumepos=0;
+ int local_len, remote_len;
+ longmode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rssl|l, z_ftp, local,
local_len, remote, remote_len, mode, resumepos) == FAILURE) {
return;
@@ -687,7 +691,8 @@
ftptype_t xtype;
php_stream *outstream;
char*local, *remote;
- int local_len, remote_len, mode, resumepos=0, ret;
+ int local_len, remote_len, ret;
+ longmode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rssl|l, z_ftp, local,
local_len, remote, remote_len, mode, resumepos) == FAILURE) {
return;
@@ -786,7 +791,8 @@
zval*z_ftp, *z_file;
ftpbuf_t*ftp;
ftptype_t xtype;
- int mode, remote_len, startpos=0;
+ int remote_len;
+ longmode, startpos=0;
php_stream *stream;
char*remote;
@@ -832,7 +838,8 @@
zval*z_ftp, *z_file;
ftpbuf_t*ftp;
ftptype_t xtype;
- int mode, remote_len, startpos=0, ret;
+ int remote_len, ret;
+ longmode, startpos=0;
php_stream *stream;
char*remote;
@@ -884,7 +891,8 @@
ftpbuf_t*ftp;
ftptype_t xtype;
char*remote, *local;
- int remote_len, local_len, mode, startpos=0;
+ int remote_len, local_len;
+ longmode, startpos=0;
php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rssl|l, z_ftp,
remote, remote_len, local, local_len, mode, startpos) == FAILURE) {
@@ -936,7 +944,8 @@
ftpbuf_t*ftp;
ftptype_t xtype;
char*remote, *local;
- int remote_len, local_len, mode, startpos=0, ret;
+ int remote_len, local_len, ret;
+ longmode, startpos=0;
php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rssl|l, z_ftp,
remote, remote_len, local, local_len, mode, startpos) == FAILURE) {
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.132 php4/ext/sockets/sockets.c:1.133
--- php4/ext/sockets/sockets.c:1.132Thu Mar 6 18:07:26 2003
+++ php4/ext/sockets/sockets.c Mon Mar 10 10:52:10 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.132 2003/03/06 23:07:26 ddhill Exp $ */
+/* $Id: sockets.c,v 1.133 2003/03/10 15:52:10 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1027,7 +1027,7 @@
php_socket *php_sock;
char
Re: [PHP-CVS] cvs: php4 /ext/ftp php_ftp.c /ext/sockets sockets.c
On Mon, 10 Mar 2003, David Hill wrote: ddhillMon Mar 10 10:52:11 2003 EDT Modified files: /php4/ext/ftp php_ftp.c /php4/ext/sockets sockets.c Log: fixing missed int to long with zend_parse_parameters Dont forget to merge this if that's needed... Derick -- my other box is your windows PC - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/ftp php_ftp.c /ext/sockets sockets.c
ddhill Mon Mar 10 10:57:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/ftp php_ftp.c
/php4/ext/sockets sockets.c
Log:
fixing missed int to long with zend_parse_parameters
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.74.2.5 php4/ext/ftp/php_ftp.c:1.74.2.6
--- php4/ext/ftp/php_ftp.c:1.74.2.5 Fri Mar 7 08:42:13 2003
+++ php4/ext/ftp/php_ftp.c Mon Mar 10 10:57:07 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.74.2.5 2003/03/07 13:42:13 ddhill Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.6 2003/03/10 15:57:07 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -897,7 +897,7 @@
ftptype_t xtype;
char*remote, *local;
int remote_len, local_len, ret;
- int mode, startpos=0;
+ longmode, startpos=0;
php_stream * instream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rssl|l, z_ftp,
remote, remote_len, local, local_len, mode, startpos) == FAILURE) {
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.125.2.4 php4/ext/sockets/sockets.c:1.125.2.5
--- php4/ext/sockets/sockets.c:1.125.2.4Fri Mar 7 08:42:18 2003
+++ php4/ext/sockets/sockets.c Mon Mar 10 10:57:07 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.125.2.4 2003/03/07 13:42:18 ddhill Exp $ */
+/* $Id: sockets.c,v 1.125.2.5 2003/03/10 15:57:07 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1035,7 +1035,7 @@
php_socket *php_sock;
char*addr;
int addr_len;
- int port = 0;
+ longport = 0;
longretval = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs|l, arg1, addr,
addr_len, port) == FAILURE)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/libgd gdft.c
iliaa Mon Mar 10 14:07:23 2003 EDT
Modified files:
/php4/ext/gd/libgd gdft.c
Log:
Fixed bug #22613 (imagettfbox() does not add the kerning distance to the
running position).
Fixed few possible memory leaks.
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.19 php4/ext/gd/libgd/gdft.c:1.20
--- php4/ext/gd/libgd/gdft.c:1.19 Sun Jan 5 23:29:33 2003
+++ php4/ext/gd/libgd/gdft.cMon Mar 10 14:07:22 2003
@@ -768,318 +768,279 @@
}
char *
-gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist,
-double ptsize, double angle, int x, int y, char *string,
- gdFTStringExtraPtr strex)
+gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsize,
double angle, int x, int y, char *string, gdFTStringExtraPtr strex)
{
- FT_BBox bbox, glyph_bbox;
- FT_Matrix matrix;
- FT_Vector pen, delta, penf;
- FT_Face face;
- FT_Glyph image;
- FT_GlyphSlot slot;
- FT_Error err;
- FT_Bool use_kerning;
- FT_UInt glyph_index, previous;
- double sin_a = sin (angle);
- double cos_a = cos (angle);
- int len, i = 0, ch;
- int x1 = 0, y1 = 0;
- font_t *font;
- fontkey_t fontkey;
- char *next;
- char *tmpstr = 0;
- int render = (im (im-trueColor || (fg = 255 fg = -255)));
- FT_BitmapGlyph bm;
- int render_mode = FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT;
- /* Now tuneable thanks to Wez Furlong */
- double linespace = LINESPACE;
- /* 2.0.6: put this declaration with the other declarations! */
- /*
- * make a new tweenColorCache on every call
- * because caching colormappings between calls
- * is not safe. If the im-pointer points to a
- * brand new image, the cache gives out bogus
- * colorindexes. -- 27.06.2001 [EMAIL PROTECTED]
- */
- gdCache_head_t *tc_cache;
-
- if (strex) {
-if ((strex-flags gdFTEX_LINESPACE) == gdFTEX_LINESPACE) {
- linespace = strex-linespacing;
-}
- }
- tc_cache = gdCacheCreate( TWEENCOLORCACHESIZE,
- tweenColorTest, tweenColorFetch, tweenColorRelease );
-
-/* initialize font library and font cache on first call **/
-
- if (!fontCache)
-{
- if (FT_Init_FreeType (library))
- {
- gdCacheDelete( tc_cache );
- return Failure to initialize font library;
+ FT_BBox bbox, glyph_bbox;
+ FT_Matrix matrix;
+ FT_Vector pen, delta, penf;
+ FT_Face face;
+ FT_Glyph image;
+ FT_GlyphSlot slot;
+ FT_Bool use_kerning;
+ FT_UInt glyph_index, previous;
+ double sin_a = sin (angle);
+ double cos_a = cos (angle);
+ int len, i = 0, ch;
+ int x1 = 0, y1 = 0;
+ font_t *font;
+ fontkey_t fontkey;
+ char *next;
+ char *tmpstr = NULL;
+ int render = (im (im-trueColor || (fg = 255 fg = -255)));
+ FT_BitmapGlyph bm;
+ int render_mode = FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT;
+ /* Now tuneable thanks to Wez Furlong */
+ double linespace = LINESPACE;
+ /* 2.0.6: put this declaration with the other declarations! */
+ /*
+ * make a new tweenColorCache on every call
+ * because caching colormappings between calls
+ * is not safe. If the im-pointer points to a
+ * brand new image, the cache gives out bogus
+ * colorindexes. -- 27.06.2001 [EMAIL PROTECTED]
+ */
+ gdCache_head_t *tc_cache;
+
+ if (strex ((strex-flags gdFTEX_LINESPACE) == gdFTEX_LINESPACE)) {
+ linespace = strex-linespacing;
+ }
+ tc_cache = gdCacheCreate(TWEENCOLORCACHESIZE, tweenColorTest, tweenColorFetch,
tweenColorRelease);
+
+ /* initialize font library and font cache on first call **/
+
+ if (!fontCache) {
+ if (FT_Init_FreeType (library)) {
+ gdCacheDelete( tc_cache );
+ return Failure to initialize font library;
+ }
+ fontCache = gdCacheCreate(FONTCACHESIZE, fontTest, fontFetch,
fontRelease);
+ }
+ /*/
+
+ /* get the font (via font cache) */
+ fontkey.fontlist = fontlist;
+ fontkey.library = library;
+ font = (font_t *) gdCacheGet (fontCache, fontkey);
+ if (!font) {
+ gdCacheDelete(tc_cache);
+ return fontCache-error;
+ }
+ face = font-face; /* shortcut */
+ slot = face-glyph; /* shortcut */
+
+ if (FT_Set_Char_Size (face, 0, (FT_F26Dot6) (ptsize * 64), GD_RESOLUTION,
GD_RESOLUTION)) {
+ gdCacheDelete(tc_cache);
+ return Could not set character size;
+ }
+
+ matrix.xx = (FT_Fixed) (cos_a * (1 16));
+ matrix.yx = (FT_Fixed) (sin_a * (1 16));
+ matrix.xy = -matrix.yx;
+ matrix.yy = matrix.xx;
+
+ penf.x = penf.y = 0;/* running position of non-rotated string */
+ pen.x =
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd/libgd gdft.c
iliaa Mon Mar 10 14:07:49 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd/libgd gdft.c
Log:
MFH
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.11.2.5 php4/ext/gd/libgd/gdft.c:1.11.2.6
--- php4/ext/gd/libgd/gdft.c:1.11.2.5 Wed Mar 5 11:04:20 2003
+++ php4/ext/gd/libgd/gdft.cMon Mar 10 14:07:49 2003
@@ -768,318 +768,279 @@
}
char *
-gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist,
-double ptsize, double angle, int x, int y, char *string,
- gdFTStringExtraPtr strex)
+gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsize,
double angle, int x, int y, char *string, gdFTStringExtraPtr strex)
{
- FT_BBox bbox, glyph_bbox;
- FT_Matrix matrix;
- FT_Vector pen, delta, penf;
- FT_Face face;
- FT_Glyph image;
- FT_GlyphSlot slot;
- FT_Error err;
- FT_Bool use_kerning;
- FT_UInt glyph_index, previous;
- double sin_a = sin (angle);
- double cos_a = cos (angle);
- int len, i = 0, ch;
- int x1 = 0, y1 = 0;
- font_t *font;
- fontkey_t fontkey;
- char *next;
- char *tmpstr = 0;
- int render = (im (im-trueColor || (fg = 255 fg = -255)));
- FT_BitmapGlyph bm;
- int render_mode = FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT;
- /* Now tuneable thanks to Wez Furlong */
- double linespace = LINESPACE;
- /* 2.0.6: put this declaration with the other declarations! */
- /*
- * make a new tweenColorCache on every call
- * because caching colormappings between calls
- * is not safe. If the im-pointer points to a
- * brand new image, the cache gives out bogus
- * colorindexes. -- 27.06.2001 [EMAIL PROTECTED]
- */
- gdCache_head_t *tc_cache;
-
- if (strex) {
-if ((strex-flags gdFTEX_LINESPACE) == gdFTEX_LINESPACE) {
- linespace = strex-linespacing;
-}
- }
- tc_cache = gdCacheCreate( TWEENCOLORCACHESIZE,
- tweenColorTest, tweenColorFetch, tweenColorRelease );
-
-/* initialize font library and font cache on first call **/
-
- if (!fontCache)
-{
- if (FT_Init_FreeType (library))
- {
- gdCacheDelete( tc_cache );
- return Failure to initialize font library;
+ FT_BBox bbox, glyph_bbox;
+ FT_Matrix matrix;
+ FT_Vector pen, delta, penf;
+ FT_Face face;
+ FT_Glyph image;
+ FT_GlyphSlot slot;
+ FT_Bool use_kerning;
+ FT_UInt glyph_index, previous;
+ double sin_a = sin (angle);
+ double cos_a = cos (angle);
+ int len, i = 0, ch;
+ int x1 = 0, y1 = 0;
+ font_t *font;
+ fontkey_t fontkey;
+ char *next;
+ char *tmpstr = NULL;
+ int render = (im (im-trueColor || (fg = 255 fg = -255)));
+ FT_BitmapGlyph bm;
+ int render_mode = FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT;
+ /* Now tuneable thanks to Wez Furlong */
+ double linespace = LINESPACE;
+ /* 2.0.6: put this declaration with the other declarations! */
+ /*
+ * make a new tweenColorCache on every call
+ * because caching colormappings between calls
+ * is not safe. If the im-pointer points to a
+ * brand new image, the cache gives out bogus
+ * colorindexes. -- 27.06.2001 [EMAIL PROTECTED]
+ */
+ gdCache_head_t *tc_cache;
+
+ if (strex ((strex-flags gdFTEX_LINESPACE) == gdFTEX_LINESPACE)) {
+ linespace = strex-linespacing;
+ }
+ tc_cache = gdCacheCreate(TWEENCOLORCACHESIZE, tweenColorTest, tweenColorFetch,
tweenColorRelease);
+
+ /* initialize font library and font cache on first call **/
+
+ if (!fontCache) {
+ if (FT_Init_FreeType (library)) {
+ gdCacheDelete( tc_cache );
+ return Failure to initialize font library;
+ }
+ fontCache = gdCacheCreate(FONTCACHESIZE, fontTest, fontFetch,
fontRelease);
+ }
+ /*/
+
+ /* get the font (via font cache) */
+ fontkey.fontlist = fontlist;
+ fontkey.library = library;
+ font = (font_t *) gdCacheGet (fontCache, fontkey);
+ if (!font) {
+ gdCacheDelete(tc_cache);
+ return fontCache-error;
+ }
+ face = font-face; /* shortcut */
+ slot = face-glyph; /* shortcut */
+
+ if (FT_Set_Char_Size (face, 0, (FT_F26Dot6) (ptsize * 64), GD_RESOLUTION,
GD_RESOLUTION)) {
+ gdCacheDelete(tc_cache);
+ return Could not set character size;
+ }
+
+ matrix.xx = (FT_Fixed) (cos_a * (1 16));
+ matrix.yx = (FT_Fixed) (sin_a * (1 16));
+ matrix.xy = -matrix.yx;
+ matrix.yy = matrix.xx;
+
+ penf.x = penf.y = 0;/* running position of non-rotated string */
+ pen.x = pen.y = 0; /* running position of rotated string */
+ bbox.xMin = bbox.xMax =
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
iliaa Mon Mar 10 14:09:23 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Bug fixing news. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.129 php4/NEWS:1.1247.2.130 --- php4/NEWS:1.1247.2.129 Sat Mar 8 13:28:08 2003 +++ php4/NEWS Mon Mar 10 14:09:22 2003 @@ -27,6 +27,8 @@ - Fixed a bug in GD's truecolor TTF handling. (Derick) - Fixed several 64-bit problems. (Dave) - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe) +- Fixed bug #22613 (imagettfbox() does not add the kerning distance to the + running position). (Ilia) - Fixed bug #22585 (Do not terminate the script on minor errors). (Ilia) - Fixed bug #22550 (overflow protection for upload_max_filesize ini option). (Ilia) - Fixed bug #22544 (writing transparency to truecolor png images). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c /ext/standard url_scanner.c url_scanner_ex.c
ddhill Mon Mar 10 15:30:33 2003 EDT
Modified files:
/php4/ext/pgsql pgsql.c
/php4/ext/standard url_scanner.c url_scanner_ex.c
Log:
Correcting int/long mismatched - 64bit issues.
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.265 php4/ext/pgsql/pgsql.c:1.266
--- php4/ext/pgsql/pgsql.c:1.265Fri Mar 7 00:15:20 2003
+++ php4/ext/pgsql/pgsql.c Mon Mar 10 15:30:32 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.265 2003/03/07 05:15:20 sniper Exp $ */
+/* $Id: pgsql.c,v 1.266 2003/03/10 20:30:32 ddhill Exp $ */
#include stdlib.h
@@ -1727,7 +1727,7 @@
zval *pgsql_link = NULL;
long oid_long;
char *oid_string, *end_ptr;
- size_t oid_strlen;
+ int oid_strlen;
PGconn *pgsql;
Oid oid;
int id = -1;
@@ -1794,7 +1794,7 @@
zval *pgsql_link = NULL;
long oid_long;
char *oid_string, *end_ptr, *mode_string;
- size_t oid_strlen, mode_strlen;
+ int oid_strlen, mode_strlen;
PGconn *pgsql;
Oid oid;
int id = -1, pgsql_mode=0, pgsql_lofd;
@@ -2099,7 +2099,7 @@
{
zval *pgsql_link = NULL;
char *file_out, *oid_string, *end_ptr;
- size_t oid_strlen;
+ int oid_strlen;
int id = -1, name_len;
long oid_long;
Oid oid;
@@ -2599,8 +2599,8 @@
PHP_FUNCTION(pg_escape_string)
{
char *from = NULL, *to = NULL;
- size_t to_len;
- long from_len;
+ int to_len;
+ int from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
from, from_len) ==
FAILURE) {
return;
@@ -2618,7 +2618,7 @@
{
char *from = NULL, *to = NULL;
size_t to_len;
- long from_len;
+ int from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
from, from_len) ==
FAILURE) {
return;
@@ -2740,7 +2740,7 @@
{
char *from = NULL, *to = NULL;
size_t to_len;
- long from_len;
+ int from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
from, from_len) ==
FAILURE) {
return;
@@ -3077,7 +3077,7 @@
PGresult *pg_result;
char *tmp_name;
smart_str querystr = {0};
- size_t new_len;
+ int new_len;
int i, num_rows;
zval *elem;
@@ -3969,7 +3969,8 @@
char buf[256];
char *fld;
smart_str querystr = {0};
- int key_type, fld_len, ret = FAILURE;
+ int key_type, ret = FAILURE;
+ uint fld_len;
ulong num_idx;
HashPosition pos;
@@ -4099,7 +4100,7 @@
static inline int build_assignment_string(smart_str *querystr, HashTable *ht, const
char *pad, int pad_len TSRMLS_DC)
{
HashPosition pos;
- size_t fld_len;
+ uint fld_len;
int key_type;
ulong num_idx;
char *fld;
Index: php4/ext/standard/url_scanner.c
diff -u php4/ext/standard/url_scanner.c:1.40 php4/ext/standard/url_scanner.c:1.41
--- php4/ext/standard/url_scanner.c:1.40Tue Dec 31 11:07:56 2002
+++ php4/ext/standard/url_scanner.c Mon Mar 10 15:30:33 2003
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe [EMAIL PROTECTED]|
+--+
*/
-/* $Id: url_scanner.c,v 1.40 2002/12/31 16:07:56 sebastian Exp $ */
+/* $Id: url_scanner.c,v 1.41 2003/03/10 20:30:33 ddhill Exp $ */
#include php.h
@@ -88,7 +88,7 @@
/* {{{ url_adapt_ext
*/
-char *url_adapt_ext(const char *src, size_t srclen, const char *name, const char
*val, size_t *newlen)
+char *url_adapt_ext(const char *src, uint srclen, const char *name, const char *val,
size_t *newlen)
{
char buf[1024];
Index: php4/ext/standard/url_scanner_ex.c
diff -u php4/ext/standard/url_scanner_ex.c:1.74 php4/ext/standard/url_scanner_ex.c:1.75
--- php4/ext/standard/url_scanner_ex.c:1.74 Wed Feb 12 09:56:13 2003
+++ php4/ext/standard/url_scanner_ex.c Mon Mar 10 15:30:33 2003
@@ -860,7 +860,7 @@
}
-static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard/tests/strings bug22224.phpt
moriyoshi Mon Mar 10 15:42:33 2003 EDT
Modified files:
/php4/ext/standard/tests/stringsbug4.phpt
Log:
Modified the test to reflect the recent change on var_dump()
Index: php4/ext/standard/tests/strings/bug4.phpt
diff -u php4/ext/standard/tests/strings/bug4.phpt:1.1
php4/ext/standard/tests/strings/bug4.phpt:1.2
--- php4/ext/standard/tests/strings/bug4.phpt:1.1 Fri Feb 14 13:42:36 2003
+++ php4/ext/standard/tests/strings/bug4.phpt Mon Mar 10 15:42:33 2003
@@ -14,13 +14,13 @@
var_dump(implode(,,$arr));
var_dump($arr)
?
---EXPECT--
+--EXPECTF--
string(13) Object,Object
array(2) {
[0]=
- object(foo)(0) {
+ object(foo)#%d (0) {
}
[1]=
- object(foo)(0) {
+ object(foo)#%d (0) {
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/lang bug22231.phpt
moriyoshi Mon Mar 10 15:46:39 2003 EDT
Modified files:
/php4/tests/langbug22231.phpt
Log:
Modified the test to reflect the recent change on var_dump()
Index: php4/tests/lang/bug22231.phpt
diff -u php4/tests/lang/bug22231.phpt:1.1 php4/tests/lang/bug22231.phpt:1.2
--- php4/tests/lang/bug22231.phpt:1.1 Sat Feb 15 10:15:14 2003
+++ php4/tests/lang/bug22231.phpt Mon Mar 10 15:46:39 2003
@@ -24,14 +24,14 @@
$foo = foo();
var_dump($foo-fubar);
?
---EXPECT--
-object(foo)(1) {
+--EXPECTF--
+object(foo)#%d (1) {
[fubar]=
string(5) fubar
}
string(5) fubar
string(5) fubar
-object(foo)(1) {
+object(foo)#%d (1) {
[fubar]=
string(5) fubar
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/classes __set__get_001.phpt
jay Mon Mar 10 16:27:48 2003 EDT
Modified files:
/php4/tests/classes __set__get_001.phpt
Log:
modified test to reflect change in var_dump().
Index: php4/tests/classes/__set__get_001.phpt
diff -u php4/tests/classes/__set__get_001.phpt:1.1
php4/tests/classes/__set__get_001.phpt:1.2
--- php4/tests/classes/__set__get_001.phpt:1.1 Mon Mar 3 11:44:37 2003
+++ php4/tests/classes/__set__get_001.phpt Mon Mar 10 16:27:48 2003
@@ -46,7 +46,7 @@
var_dump($foo);
?
---EXPECT--
+--EXPECTF--
Setting [a] to 100
OK!
Getting [a]
@@ -57,7 +57,7 @@
Nothing!
Setting [z] to 1
Not OK!
-object(setter)(2) {
+object(setter)#%d (2) {
[n]=
int(1)
[x]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard url_scanner_ex.re
sniper Mon Mar 10 17:59:35 2003 EDT
Modified files:
/php4/ext/standard url_scanner_ex.re
Log:
64bit issue fixed
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.64
php4/ext/standard/url_scanner_ex.re:1.65
--- php4/ext/standard/url_scanner_ex.re:1.64Wed Feb 12 09:56:13 2003
+++ php4/ext/standard/url_scanner_ex.re Mon Mar 10 17:59:34 2003
@@ -359,7 +359,7 @@
}
-static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard url_scanner_ex.c
sniper Mon Mar 10 17:59:46 2003 EDT Modified files: /php4/ext/standard url_scanner_ex.c Log: touch Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.75 php4/ext/standard/url_scanner_ex.c:1.76 --- php4/ext/standard/url_scanner_ex.c:1.75 Mon Mar 10 15:30:33 2003 +++ php4/ext/standard/url_scanner_ex.c Mon Mar 10 17:59:46 2003 @@ -1,5 +1,5 @@ -/* Generated by re2c 0.5 on Wed Feb 12 09:54:41 2003 */ -#line 1 /home/rei/PHP_CVS/php5/ext/standard/url_scanner_ex.re +/* Generated by re2c 0.5 on Tue Mar 11 00:58:47 2003 */ +#line 1 /usr/src/web/php/php5/ext/standard/url_scanner_ex.re /* +--+ | PHP Version 4| -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard url_scanner_ex.re
sniper Mon Mar 10 18:09:25 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard url_scanner_ex.re
Log:
MFH
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.63.2.1
php4/ext/standard/url_scanner_ex.re:1.63.2.2
--- php4/ext/standard/url_scanner_ex.re:1.63.2.1Wed Feb 12 09:58:30 2003
+++ php4/ext/standard/url_scanner_ex.re Mon Mar 10 18:09:25 2003
@@ -359,7 +359,7 @@
}
-static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard url_scanner_ex.c
sniper Mon Mar 10 18:09:30 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard url_scanner_ex.c
Log:
MFH
Index: php4/ext/standard/url_scanner_ex.c
diff -u php4/ext/standard/url_scanner_ex.c:1.72.2.2
php4/ext/standard/url_scanner_ex.c:1.72.2.3
--- php4/ext/standard/url_scanner_ex.c:1.72.2.2 Wed Feb 12 09:58:30 2003
+++ php4/ext/standard/url_scanner_ex.c Mon Mar 10 18:09:30 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Wed Feb 12 10:07:57 2003 */
-#line 1 /home/rei/PHP_CVS/STABLE/php4/ext/standard/url_scanner_ex.re
+/* Generated by re2c 0.5 on Tue Mar 11 01:09:00 2003 */
+#line 1 /usr/src/web/php/php4/ext/standard/url_scanner_ex.re
/*
+--+
| PHP Version 4|
@@ -860,7 +860,7 @@
}
-static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard url_scanner.c
sniper Mon Mar 10 18:09:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard url_scanner.c
Log:
MFH
Index: php4/ext/standard/url_scanner.c
diff -u php4/ext/standard/url_scanner.c:1.38.2.1
php4/ext/standard/url_scanner.c:1.38.2.2
--- php4/ext/standard/url_scanner.c:1.38.2.1Tue Dec 31 11:35:35 2002
+++ php4/ext/standard/url_scanner.c Mon Mar 10 18:09:38 2003
@@ -12,10 +12,10 @@
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
- | Author: Hartmut Holzgraefe [EMAIL PROTECTED] |
+ | Author: Hartmut Holzgraefe [EMAIL PROTECTED]|
+--+
*/
-/* $Id: url_scanner.c,v 1.38.2.1 2002/12/31 16:35:35 sebastian Exp $ */
+/* $Id: url_scanner.c,v 1.38.2.2 2003/03/10 23:09:38 sniper Exp $ */
#include php.h
@@ -88,7 +88,7 @@
/* {{{ url_adapt_ext
*/
-char *url_adapt_ext(const char *src, size_t srclen, const char *name, const char
*val, size_t *newlen)
+char *url_adapt_ext(const char *src, uint srclen, const char *name, const char *val,
size_t *newlen)
{
char buf[1024];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c
sniper Mon Mar 10 18:13:03 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c
Log:
MFH
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.12 php4/ext/pgsql/pgsql.c:1.244.2.13
--- php4/ext/pgsql/pgsql.c:1.244.2.12 Sun Mar 9 14:15:16 2003
+++ php4/ext/pgsql/pgsql.c Mon Mar 10 18:13:03 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.12 2003/03/09 19:15:16 derick Exp $ */
+/* $Id: pgsql.c,v 1.244.2.13 2003/03/10 23:13:03 sniper Exp $ */
#include stdlib.h
@@ -997,7 +997,7 @@
#if HAVE_PQCMDTUPLES
Z_LVAL_P(return_value) = atoi(PQcmdTuples(pgsql_result));
#else
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Not supportted
under this build.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Not supported
under this build.);
Z_LVAL_P(return_value) = 0;
#endif
break;
@@ -1727,7 +1727,7 @@
zval *pgsql_link = NULL;
long oid_long;
char *oid_string, *end_ptr;
- size_t oid_strlen;
+ int oid_strlen;
PGconn *pgsql;
Oid oid;
int id = -1;
@@ -1794,7 +1794,7 @@
zval *pgsql_link = NULL;
long oid_long;
char *oid_string, *end_ptr, *mode_string;
- size_t oid_strlen, mode_strlen;
+ int oid_strlen, mode_strlen;
PGconn *pgsql;
Oid oid;
int id = -1, pgsql_mode=0, pgsql_lofd;
@@ -2099,7 +2099,7 @@
{
zval *pgsql_link = NULL;
char *file_out, *oid_string, *end_ptr;
- size_t oid_strlen;
+ int oid_strlen;
int id = -1, name_len;
long oid_long;
Oid oid;
@@ -2442,9 +2442,7 @@
case PGRES_COPY_OUT:
if (pgsql_result) {
PQclear(pgsql_result);
- if (array_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
while (!copydone)
{
if ((ret = PQgetline(pgsql, copybuf,
COPYBUFSIZ))) {
@@ -2601,8 +2599,8 @@
PHP_FUNCTION(pg_escape_string)
{
char *from = NULL, *to = NULL;
- size_t to_len;
- long from_len;
+ int to_len;
+ int from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
from, from_len) ==
FAILURE) {
return;
@@ -2620,7 +2618,7 @@
{
char *from = NULL, *to = NULL;
size_t to_len;
- long from_len;
+ int from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
from, from_len) ==
FAILURE) {
return;
@@ -2668,8 +2666,6 @@
buflen = strlen(strtext); /* will shrink, also we discover if
* strtext */
buffer = (unsigned char *) emalloc(buflen); /* isn't NULL terminated */
- if (buffer == NULL)
- return NULL;
for (bp = buffer, sp = strtext; *sp != '\0'; bp++, sp++)
{
switch (state)
@@ -2744,7 +2740,7 @@
{
char *from = NULL, *to = NULL;
size_t to_len;
- long from_len;
+ int from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
from, from_len) ==
FAILURE) {
return;
@@ -2957,7 +2953,7 @@
/* }}} */
-/* {{{ proto resource pg_get_result([resource connection])
+/* {{{ proto resource pg_get_result(resource connection)
Get asynchronous query result */
PHP_FUNCTION(pg_get_result)
{
@@ -3081,7 +3077,7 @@
PGresult *pg_result;
char *tmp_name;
smart_str querystr = {0};
- size_t new_len;
+ int new_len;
int i, num_rows;
zval *elem;
@@ -3269,11 +3265,7 @@
return FAILURE;
}
subs = (regmatch_t *)ecalloc(sizeof(regmatch_t), re.re_nsub+1);
- if (!subs) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot allocate memory.);
- regfree(re);
- return FAILURE;
- }
+
regerr = regexec(re, str, re.re_nsub+1, subs, 0);
if (regerr == REG_NOMATCH) {
#ifdef PHP_DEBUG
@@ -3353,11 +3345,7 @@
return FAILURE;
}
MAKE_STD_ZVAL(meta);
- if (array_init(meta) == FAILURE) {
- zval_dtor(meta);
- FREE_ZVAL(meta);
- return FAILURE;
- }
+ array_init(meta);
if (php_pgsql_meta_data(pg_link, table_name, meta TSRMLS_CC) == FAILURE) {
Re: [PHP-CVS] cvs: php4 /ext/xmlrpc xmlrpc-epi-php.c
MFH?
On Sat, 1 Mar 2003, Wez Furlong wrote:
wezSat Mar 1 10:40:06 2003 EDT
Modified files:
/php4/ext/xmlrpc xmlrpc-epi-php.c
Log:
Fix two crash bugs when optional parameters are not specified.
Fix folding markers.
Index: php4/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.29 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.30
--- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.29 Tue Jan 14 16:02:14 2003
+++ php4/ext/xmlrpc/xmlrpc-epi-php.c Sat Mar 1 10:40:06 2003
@@ -746,7 +746,7 @@
}
if(return_value_used) {
- zval* retval = decode_request_worker(*xml, *encoding, *method);
+ zval* retval = decode_request_worker(*xml, encoding ? *encoding :
NULL, *method);
if(retval) {
*return_value = *retval;
FREE_ZVAL(retval);
@@ -773,7 +773,7 @@
}
if(return_value_used) {
- zval* retval = decode_request_worker(*arg1, *arg2, NULL);
+ zval* retval = decode_request_worker(*arg1, arg2 ? *arg2 : NULL, NULL);
if(retval) {
*return_value = *retval;
FREE_ZVAL(retval);
@@ -787,7 +787,7 @@
* server related methods *
*/
-/* {{{ proto handle xmlrpc_server_create(void)
+/* {{{ proto resource xmlrpc_server_create(void)
Creates an xmlrpc server */
PHP_FUNCTION(xmlrpc_server_create)
{
@@ -815,8 +815,9 @@
ZEND_REGISTER_RESOURCE(return_value,server, le_xmlrpc_server);
}
}
+/* }}} */
-/* {{{ proto void xmlrpc_server_destroy(handle server)
+/* {{{ proto void xmlrpc_server_destroy(resource server)
Destroys server resources */
PHP_FUNCTION(xmlrpc_server_destroy)
{
@@ -842,6 +843,7 @@
}
RETVAL_LONG(bSuccess == SUCCESS);
}
+/* }}} */
/* called by xmlrpc C engine as method handler for all registered methods.
@@ -942,7 +944,7 @@
zend_hash_clean(Z_ARRVAL_P(pData-server-introspection_map));
}
-/* {{{ proto bool xmlrpc_server_register_method(handle server, string method_name,
string function)
+/* {{{ proto bool xmlrpc_server_register_method(resource server, string method_name,
string function)
Register a PHP function to handle method matching method_name */
PHP_FUNCTION(xmlrpc_server_register_method)
{
@@ -974,9 +976,10 @@
}
RETURN_BOOL(0);
}
+/* }}} */
-/* {{{ proto bool xmlrpc_server_register_introspection_callback(handle server,
string function)
+/* {{{ proto bool xmlrpc_server_register_introspection_callback(resource server,
string function)
Register a PHP function to generate documentation */
PHP_FUNCTION(xmlrpc_server_register_introspection_callback)
{
@@ -1003,11 +1006,12 @@
}
RETURN_BOOL(0);
}
+/* }}} */
/* this function is itchin for a re-write */
-/* {{{ proto mixed xmlrpc_server_call_method(handle server, string xml, mixed
user_data [, array output_options])
+/* {{{ proto mixed xmlrpc_server_call_method(resource server, string xml, mixed
user_data [, array output_options])
Parses XML requests and call methods */
PHP_FUNCTION(xmlrpc_server_call_method)
{
@@ -1126,9 +1130,10 @@
}
}
}
+/* }}} */
-/* {{{ proto int xmlrpc_server_add_introspection_data(handle server, array desc)
+/* {{{ proto int xmlrpc_server_add_introspection_data(resource server, array desc)
Adds introspection documentation */
PHP_FUNCTION(xmlrpc_server_add_introspection_data)
{
@@ -1152,6 +1157,7 @@
}
RETURN_LONG(0);
}
+/* }}} */
/* {{{ proto array xmlrpc_parse_method_descriptions(string xml)
@@ -1191,6 +1197,7 @@
}
}
}
+/* }}} */
/
@@ -1335,15 +1342,15 @@
case IS_NULL:
type = xmlrpc_base64;
break;
- #ifndef BOOL_AS_LONG
+#ifndef BOOL_AS_LONG
/* Right thing to do, but it breaks some legacy code. */
case IS_BOOL:
type = xmlrpc_boolean;
break;
- #else
+#else
case IS_BOOL:
- #endif
+#endif
case IS_LONG:
case IS_RESOURCE:
type = xmlrpc_int;
@@ -1415,6 +1422,7 @@
}
RETURN_FALSE;
}
+/* }}} */
/* {{{ proto string xmlrpc_get_type(mixed value)
Gets xmlrpc type for a PHP value. Especially useful for base64 and datetime
strings */
@@ -1435,6 +1443,7 @@
RETURN_STRING((char*) xmlrpc_type_as_str(type, vtype), 1);
}
+/* }}} */
/* {{{ proto string xmlrpc_is_fault(array)
Determines if an array value represents an XMLRPC fault. */
@@ -1463,6 +1472,7 @@
RETURN_FALSE;
}
+/* }}} */
--
- For Sale! -
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mysqli config.m4
georg Mon Mar 10 20:22:20 2003 EDT Modified files: /php4/ext/mysqliconfig.m4 Log: added new profiler-files Index: php4/ext/mysqli/config.m4 diff -u php4/ext/mysqli/config.m4:1.3 php4/ext/mysqli/config.m4:1.4 --- php4/ext/mysqli/config.m4:1.3 Mon Mar 3 17:36:47 2003 +++ php4/ext/mysqli/config.m4 Mon Mar 10 20:22:20 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2003/03/03 22:36:47 georg Exp $ +dnl $Id: config.m4,v 1.4 2003/03/11 01:22:20 georg Exp $ dnl config.m4 for extension mysqli dnl Comments in this file start with the string 'dnl'. @@ -54,5 +54,5 @@ ]) PHP_SUBST(MYSQLI_SHARED_LIBADD) - PHP_NEW_EXTENSION(mysqli, mysqli.c mysqli_api.c mysqli_nonapi.c mysqli_fe.c mysqli_profiler.c, $ext_shared) + PHP_NEW_EXTENSION(mysqli, mysqli.c mysqli_api.c mysqli_nonapi.c mysqli_fe.c mysqli_profiler.c mysqli_profiler_com.c, $ext_shared) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard url_scanner_ex.c url_scanner_ex.re
sas Mon Mar 10 20:50:18 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard url_scanner_ex.c url_scanner_ex.re
Log:
reverting jani's non-sense commits
Index: php4/ext/standard/url_scanner_ex.c
diff -u php4/ext/standard/url_scanner_ex.c:1.72.2.3
php4/ext/standard/url_scanner_ex.c:1.72.2.4
--- php4/ext/standard/url_scanner_ex.c:1.72.2.3 Mon Mar 10 18:09:30 2003
+++ php4/ext/standard/url_scanner_ex.c Mon Mar 10 20:50:18 2003
@@ -860,7 +860,7 @@
}
-static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.63.2.2
php4/ext/standard/url_scanner_ex.re:1.63.2.3
--- php4/ext/standard/url_scanner_ex.re:1.63.2.2Mon Mar 10 18:09:25 2003
+++ php4/ext/standard/url_scanner_ex.re Mon Mar 10 20:50:18 2003
@@ -359,7 +359,7 @@
}
-static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard url_scanner_ex.c url_scanner_ex.re
FYI: This was not MY commit, it was Dave's commit,
which I just MFH'd. (plus added to the .re file).
This was some 64bit issue..you should discuss it with
Dave and not just revert them blindly.
--Jani
On Tue, 11 Mar 2003, Sascha Schumann wrote:
sasMon Mar 10 20:47:06 2003 EDT
Modified files:
/php4/ext/standard url_scanner_ex.c url_scanner_ex.re
Log:
reverting jani's non-sense commits
Index: php4/ext/standard/url_scanner_ex.c
diff -u php4/ext/standard/url_scanner_ex.c:1.76
php4/ext/standard/url_scanner_ex.c:1.77
--- php4/ext/standard/url_scanner_ex.c:1.76Mon Mar 10 17:59:46 2003
+++ php4/ext/standard/url_scanner_ex.c Mon Mar 10 20:47:06 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Tue Mar 11 00:58:47 2003 */
-#line 1 /usr/src/web/php/php5/ext/standard/url_scanner_ex.re
+/* Generated by re2c 0.5 on Wed Feb 12 09:54:41 2003 */
+#line 1 /home/rei/PHP_CVS/php5/ext/standard/url_scanner_ex.re
/*
+--+
| PHP Version 4|
@@ -860,7 +860,7 @@
}
-static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.65
php4/ext/standard/url_scanner_ex.re:1.66
--- php4/ext/standard/url_scanner_ex.re:1.65 Mon Mar 10 17:59:34 2003
+++ php4/ext/standard/url_scanner_ex.reMon Mar 10 20:47:06 2003
@@ -359,7 +359,7 @@
}
-static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool
do_flush TSRMLS_DC)
+static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool
do_flush TSRMLS_DC)
{
url_adapt_state_ex_t *ctx;
char *retval;
--
- For Sale! -
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard url_scanner_ex.re
sas Mon Mar 10 21:28:03 2003 EDT
Modified files:
/php4/ext/standard url_scanner_ex.re
Log:
fix sizeof(size_t) sizeof(uint) issue
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.66
php4/ext/standard/url_scanner_ex.re:1.67
--- php4/ext/standard/url_scanner_ex.re:1.66Mon Mar 10 20:47:06 2003
+++ php4/ext/standard/url_scanner_ex.re Mon Mar 10 21:28:03 2003
@@ -21,6 +21,9 @@
#ifdef HAVE_UNISTD_H
#include unistd.h
#endif
+#ifdef HAVE_LIMITS_H
+#include limits.h
+#endif
#include stdio.h
#include stdlib.h
@@ -411,8 +414,15 @@
static void php_url_scanner_output_handler(char *output, uint output_len, char
**handled_output, uint *handled_output_len, int mode TSRMLS_DC)
{
+ size_t len;
+
if (BG(url_adapt_state_ex).url_app.len != 0) {
-*handled_output = url_adapt_ext(output, output_len, handled_output_len,
(zend_bool) (modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+*handled_output = url_adapt_ext(output, output_len, len, (zend_bool)
(modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+ if (sizeof(uint) sizeof(size_t)) {
+ if (len UINT_MAX)
+ len = UINT_MAX;
+ }
+ *handled_output_len = len;
} else {
*handled_output = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard url_scanner_ex.c
sas Mon Mar 10 21:28:46 2003 EDT
Modified files:
/php4/ext/standard url_scanner_ex.c
Log:
fix sizeof(size_t) sizeof(uint) issue
Index: php4/ext/standard/url_scanner_ex.c
diff -u php4/ext/standard/url_scanner_ex.c:1.77 php4/ext/standard/url_scanner_ex.c:1.78
--- php4/ext/standard/url_scanner_ex.c:1.77 Mon Mar 10 20:47:06 2003
+++ php4/ext/standard/url_scanner_ex.c Mon Mar 10 21:28:46 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Wed Feb 12 09:54:41 2003 */
-#line 1 /home/rei/PHP_CVS/php5/ext/standard/url_scanner_ex.re
+/* Generated by re2c 0.5 on Tue Mar 11 03:26:22 2003 */
+#line 1 url_scanner_ex.re
/*
+--+
| PHP Version 4|
@@ -23,6 +23,9 @@
#ifdef HAVE_UNISTD_H
#include unistd.h
#endif
+#ifdef HAVE_LIMITS_H
+#include limits.h
+#endif
#include stdio.h
#include stdlib.h
@@ -86,7 +89,7 @@
STD_PHP_INI_ENTRY(url_rewriter.tags,
a=href,area=href,frame=src,form=,fieldset=, PHP_INI_ALL, OnUpdateTags,
url_adapt_state_ex, php_basic_globals, basic_globals)
PHP_INI_END()
-#line 92
+#line 95
#define YYFILL(n) goto done
@@ -151,25 +154,25 @@
if(yych = ';') goto yy4;
yy2: yych = *++YYCURSOR;
yy3:
-#line 110
+#line 113
{ smart_str_append(dest, url); return; }
yy4: yych = *++YYCURSOR;
yy5:
-#line 111
+#line 114
{ sep = separator; goto scan; }
yy6: yych = *++YYCURSOR;
yy7:
-#line 112
+#line 115
{ bash = p - 1; goto done; }
yy8: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
yy9: if(yybm[0+yych] 128) goto yy8;
yy10:
-#line 113
+#line 116
{ goto scan; }
}
-#line 114
+#line 117
done:
@@ -382,17 +385,17 @@
if(yybm[0+yych] 128) goto yy15;
yy13: yych = *++YYCURSOR;
yy14:
-#line 282
+#line 285
{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
yy15: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
yy16: if(yybm[0+yych] 128) goto yy15;
yy17:
-#line 283
+#line 286
{ passthru(STD_ARGS); goto state_plain; }
}
-#line 284
+#line 287
state_tag:
@@ -446,11 +449,11 @@
yy20: yych = *++YYCURSOR;
goto yy25;
yy21:
-#line 289
+#line 292
{ handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE ==
STATE_PLAIN) goto state_plain; else goto state_next_arg; }
yy22: yych = *++YYCURSOR;
yy23:
-#line 290
+#line 293
{ passthru(STD_ARGS); goto state_plain_begin; }
yy24: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -458,7 +461,7 @@
yy25: if(yybm[0+yych] 128) goto yy24;
goto yy21;
}
-#line 291
+#line 294
state_next_arg_begin:
@@ -529,20 +532,20 @@
}
yy28: yych = *++YYCURSOR;
yy29:
-#line 299
+#line 302
{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
yy30: yych = *++YYCURSOR;
goto yy37;
yy31:
-#line 300
+#line 303
{ passthru(STD_ARGS); goto state_next_arg; }
yy32: yych = *++YYCURSOR;
yy33:
-#line 301
+#line 304
{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
yy34: yych = *++YYCURSOR;
yy35:
-#line 302
+#line 305
{ passthru(STD_ARGS); goto state_plain_begin; }
yy36: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -550,7 +553,7 @@
yy37: if(yybm[0+yych] 128) goto yy36;
goto yy31;
}
-#line 303
+#line 306
state_arg:
@@ -604,11 +607,11 @@
yy40: yych = *++YYCURSOR;
goto yy45;
yy41:
-#line 308
+#line 311
{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto
state_before_val; }
yy42: yych = *++YYCURSOR;
yy43:
-#line 309
+#line 312
{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
yy44: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -616,7 +619,7 @@
yy45: if(yybm[0+yych] 128) goto yy44;
goto yy41;
}
-#line 310
+#line 313
state_before_val:
@@ -671,12 +674,12 @@
if(yych == ' ') goto yy55;
if(yych == '=') goto yy53;
yy49:
-#line 316
+#line 319
{ --YYCURSOR; goto state_next_arg_begin; }
yy50: yych = *++YYCURSOR;
goto yy54;
yy51:
-#line 315
+#line 318
{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
yy52: yych = *++YYCURSOR;
goto yy49;
@@ -695,7 +698,7 @@
case 0: goto yy49;
}
}
-#line 317
+#line 320
@@ -765,7 +768,7 @@
yych = *(YYMARKER = ++YYCURSOR);
goto yy77;
yy61:
-#line 325
+#line 328
{ handle_val(STD_ARGS, 0, '\0'); goto state_next_arg_begin; }
yy62: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
@@ -774,7 +777,7 @@
goto yy67;
yy64: yych = *++YYCURSOR;
yy65:
-#line 326
+#line 329
{ passthru(STD_ARGS); goto state_next_arg_begin; }
yy66: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -791,7 +794,7 @@
yy70: yych = *++YYCURSOR;
[PHP-CVS] cvs: php4(PHP_4) /ext/standard url_scanner_ex.re
sas Mon Mar 10 21:30:12 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/standard url_scanner_ex.re
Log:
fix sizeof(size_t) sizeof(uint) issue
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.63
php4/ext/standard/url_scanner_ex.re:1.63.4.1
--- php4/ext/standard/url_scanner_ex.re:1.63Mon Sep 30 00:56:38 2002
+++ php4/ext/standard/url_scanner_ex.re Mon Mar 10 21:30:12 2003
@@ -21,6 +21,9 @@
#ifdef HAVE_UNISTD_H
#include unistd.h
#endif
+#ifdef HAVE_LIMITS_H
+#include limits.h
+#endif
#include stdio.h
#include stdlib.h
@@ -411,8 +414,15 @@
static void php_url_scanner_output_handler(char *output, uint output_len, char
**handled_output, uint *handled_output_len, int mode TSRMLS_DC)
{
+ size_t len;
+
if (BG(url_adapt_state_ex).url_app.len != 0) {
-*handled_output = url_adapt_ext(output, output_len, handled_output_len,
(zend_bool) (modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+*handled_output = url_adapt_ext(output, output_len, len, (zend_bool)
(modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+ if (sizeof(uint) sizeof(size_t)) {
+ if (len UINT_MAX)
+ len = UINT_MAX;
+ }
+ *handled_output_len = len;
} else {
*handled_output = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard url_scanner_ex.re
sas Mon Mar 10 21:31:52 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard url_scanner_ex.re
Log:
fix sizeof(size_t) sizeof(uint) issue
Index: php4/ext/standard/url_scanner_ex.re
diff -u php4/ext/standard/url_scanner_ex.re:1.63.2.3
php4/ext/standard/url_scanner_ex.re:1.63.2.4
--- php4/ext/standard/url_scanner_ex.re:1.63.2.3Mon Mar 10 20:50:18 2003
+++ php4/ext/standard/url_scanner_ex.re Mon Mar 10 21:31:52 2003
@@ -21,6 +21,9 @@
#ifdef HAVE_UNISTD_H
#include unistd.h
#endif
+#ifdef HAVE_LIMITS_H
+#include limits.h
+#endif
#include stdio.h
#include stdlib.h
@@ -411,8 +414,15 @@
static void php_url_scanner_output_handler(char *output, uint output_len, char
**handled_output, uint *handled_output_len, int mode TSRMLS_DC)
{
+ size_t len;
+
if (BG(url_adapt_state_ex).url_app.len != 0) {
-*handled_output = url_adapt_ext(output, output_len, handled_output_len,
(zend_bool) (modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+*handled_output = url_adapt_ext(output, output_len, len, (zend_bool)
(modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+ if (sizeof(uint) sizeof(size_t)) {
+ if (len UINT_MAX)
+ len = UINT_MAX;
+ }
+ *handled_output_len = len;
} else {
*handled_output = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc config.m4
sniper Mon Mar 10 22:11:52 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/odbc config.m4 Log: MFH: - Fixed bug #20715 (odbc could not be compiled as shared extension) Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.55.2.2 php4/ext/odbc/config.m4:1.55.2.3 --- php4/ext/odbc/config.m4:1.55.2.2Thu Mar 6 23:32:49 2003 +++ php4/ext/odbc/config.m4 Mon Mar 10 22:11:52 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55.2.2 2003/03/07 04:32:49 sniper Exp $ +dnl $Id: config.m4,v 1.55.2.3 2003/03/11 03:11:52 sniper Exp $ dnl dnl @@ -536,11 +536,12 @@ if test -n $ODBC_TYPE; then if test $ODBC_TYPE != dbmaker; then -if test $shared != yes; then - PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD) -fi +ext_shared=$shared +PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD) fi + AC_DEFINE(HAVE_UODBC,1,[ ]) + PHP_SUBST(ODBC_SHARED_LIBADD) PHP_SUBST(ODBC_INCDIR) PHP_SUBST(ODBC_LIBDIR) PHP_SUBST_OLD(ODBC_INCLUDE) @@ -548,5 +549,5 @@ PHP_SUBST_OLD(ODBC_LFLAGS) PHP_SUBST_OLD(ODBC_TYPE) - PHP_NEW_EXTENSION(odbc, php_odbc.c, $shared,, $ODBC_INCLUDE) + PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, $ODBC_INCLUDE) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Mon Mar 10 22:12:38 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: BFN Index: php4/NEWS diff -u php4/NEWS:1.1247.2.131 php4/NEWS:1.1247.2.132 --- php4/NEWS:1.1247.2.131 Mon Mar 10 21:13:00 2003 +++ php4/NEWS Mon Mar 10 22:12:37 2003 @@ -129,6 +129,7 @@ - Fixed bug #21131 (fopen() with mode 'a+' and rewind() doesn't work). (Wez) - Fixed bug #20857 (snmpset() failed always, patch by: [EMAIL PROTECTED]). (Jani) - Fixed bug #20802 (PHP would die silently when memory limit reached). (Ilia) +- Fixed bug #20715 (odbc could not be compiled as shared extension). (Jani) - Fixed bug #20503 (imagesetbrush() not available on Windows). (Edin) - Fixed bug #20282 (COM memory leak). (Harald) - Fixed bug #20256 (snprintf() not defined on some systems). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Mon Mar 10 22:13:05 2003 EDT Modified files: /php4 NEWS Log: This went to 4_3 branch Index: php4/NEWS diff -u php4/NEWS:1.1371 php4/NEWS:1.1372 --- php4/NEWS:1.1371Mon Mar 10 20:34:01 2003 +++ php4/NEWS Mon Mar 10 22:13:05 2003 @@ -1,7 +1,6 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- 64-bit corrections to parameters to OnUpdateInt Bug #20994 (Dave) - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Fixed bug #21600 (Assign by reference function call changes variable contents). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
