[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Nov 22 01:47:11 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2171r2=1.2172ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2171 php-src/ChangeLog:1.2172 --- php-src/ChangeLog:1.2171Mon Nov 21 01:46:10 2005 +++ php-src/ChangeLog Tue Nov 22 01:46:38 2005 @@ -1,3 +1,44 @@ +2005-11-21 Rui Hirokawa [EMAIL PROTECTED] + +* (PHP_4_4) + ext/mbstring/mbstring.c: + fixed #35307 unexpected header can be injected to mb_send_mail() (the patch + is made by masugata). + +2005-11-21 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + Makefile.global + acinclude.m4 + configure.in + ext/standard/config.m4 + scripts/Makefile.frag + scripts/php-config.in + scripts/phpize.m4: + MFH: - Fixed header installing under phpize builds + +* Makefile.global + acinclude.m4 + configure.in + ext/standard/config.m4 + scripts/Makefile.frag + scripts/php-config.in + scripts/phpize.m4: + - Fixed header installing under phpize builds + +2005-11-21 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + ZendEngine2/zend_language_scanner.l: + - MFH Fixed Bug #35286 tokenizer ext drops final comment (by greg) + +2005-11-21 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + ext/ldap/config.m4 + ext/odbc/config.m4: + test -e does not work with solaris + 2005-11-20 Derick Rethans [EMAIL PROTECTED] * ext/standard/microtime.c: @@ -16937,7 +16978,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2171 2005/11/21 06:46:10 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2172 2005/11/22 06:46:38 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -20338,7 +20379,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2171 2005/11/21 06:46:10 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2172 2005/11/22 06:46:38 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -20819,7 +20860,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2171 2005/11/21 06:46:10 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2172 2005/11/22 06:46:38 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -22293,7 +22334,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2171 2005/11/21 06:46:10 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2172 2005/11/22 06:46:38 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
dmitry Mon Nov 21 05:57:33 2005 EDT Modified files: /php-src/ext/reflection php_reflection.c Log: Fixed getParameters method http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1=1.191r2=1.192ty=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.191 php-src/ext/reflection/php_reflection.c:1.192 --- php-src/ext/reflection/php_reflection.c:1.191 Fri Nov 18 17:59:07 2005 +++ php-src/ext/reflection/php_reflection.c Mon Nov 21 05:57:28 2005 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $ */ +/* $Id: php_reflection.c,v 1.192 2005/11/21 10:57:28 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -38,6 +38,11 @@ #include zend_ini.h #include zend_interfaces.h +/* Undefine getParameters macro defined in main/php3_compat.h */ +#ifdef getParameters +# undef getParameters +#endif + /* Class entry pointers */ PHPAPI zend_class_entry *reflector_ptr; PHPAPI zend_class_entry *reflection_exception_ptr; @@ -4270,7 +4275,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.192 2005/11/21 10:57:28 dmitry Exp $); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
How about 'rm -f main/php3_compat.h' ? :) --Jani On Mon, 21 Nov 2005, Dmitry Stogov wrote: dmitry Mon Nov 21 05:57:33 2005 EDT Modified files: /php-src/ext/reflection php_reflection.c Log: Fixed getParameters method http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1=1.191r2=1.192ty=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.191 php-src/ext/reflection/php_reflection.c:1.192 --- php-src/ext/reflection/php_reflection.c:1.191 Fri Nov 18 17:59:07 2005 +++ php-src/ext/reflection/php_reflection.c Mon Nov 21 05:57:28 2005 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $ */ +/* $Id: php_reflection.c,v 1.192 2005/11/21 10:57:28 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -38,6 +38,11 @@ #include zend_ini.h #include zend_interfaces.h +/* Undefine getParameters macro defined in main/php3_compat.h */ +#ifdef getParameters +# undef getParameters +#endif + /* Class entry pointers */ PHPAPI zend_class_entry *reflector_ptr; PHPAPI zend_class_entry *reflection_exception_ptr; @@ -4270,7 +4275,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.192 2005/11/21 10:57:28 dmitry Exp $); php_info_print_table_end(); } /* }}} */ -- Give me your money at @ http://pecl.php.net/wishlist.php/sniper Donating money may make me happier and friendlier for a limited period! Death to all 4 letter abbreviations starting with P! -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
Really, I just found it. :) But removing it make sense. Dmitry. -Original Message- From: Jani Taskinen [mailto:[EMAIL PROTECTED] Sent: Monday, November 21, 2005 4:56 PM To: Dmitry Stogov Cc: php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c How about 'rm -f main/php3_compat.h' ? :) --Jani On Mon, 21 Nov 2005, Dmitry Stogov wrote: dmitry Mon Nov 21 05:57:33 2005 EDT Modified files: /php-src/ext/reflection php_reflection.c Log: Fixed getParameters method http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1 =1.191r2=1.192ty=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.191 php-src/ext/reflection/php_reflection.c:1.192 --- php-src/ext/reflection/php_reflection.c:1.191 Fri Nov 18 17:59:07 2005 +++ php-src/ext/reflection/php_reflection.c Mon Nov 21 05:57:28 2005 @@ -19,7 +19,7 @@ +- -+ */ -/* $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $ */ +/* $Id: php_reflection.c,v 1.192 2005/11/21 10:57:28 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -38,6 +38,11 @@ #include zend_ini.h #include zend_interfaces.h +/* Undefine getParameters macro defined in main/php3_compat.h */ +#ifdef getParameters # undef getParameters +#endif + /* Class entry pointers */ PHPAPI zend_class_entry *reflector_ptr; PHPAPI zend_class_entry *reflection_exception_ptr; @@ -4270,7 +4275,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v +1.192 2005/11/21 10:57:28 dmitry Exp $); php_info_print_table_end(); } /* }}} */ -- Give me your money at @ http://pecl.php.net/wishlist.php/sniper Donating money may make me happier and friendlier for a limited period! Death to all 4 letter abbreviations starting with P! -- 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/ldap config.m4 /ext/odbc config.m4
sniper Mon Nov 21 14:06:04 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/odbc config.m4 /php-src/ext/ldap config.m4 Log: test -e does not work with solaris http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.78r2=1.78.2.1ty=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.78 php-src/ext/odbc/config.m4:1.78.2.1 --- php-src/ext/odbc/config.m4:1.78 Wed Jun 22 04:26:00 2005 +++ php-src/ext/odbc/config.m4 Mon Nov 21 14:06:02 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.78 2005/06/22 08:26:00 sniper Exp $ +dnl $Id: config.m4,v 1.78.2.1 2005/11/21 19:06:02 sniper Exp $ dnl AC_DEFUN([PHP_ODBC_CHECK_HEADER],[ @@ -375,9 +375,9 @@ ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_LIBS=-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil -if test -e $ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME; then +if test -f $ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME; then ODBC_LIBS=-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil -elif test -e $ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME; then +elif test -f $ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME; then ODBC_LIBS=-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil fi http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39.2.5r2=1.39.2.6ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.39.2.5 php-src/ext/ldap/config.m4:1.39.2.6 --- php-src/ext/ldap/config.m4:1.39.2.5 Thu Nov 3 15:41:13 2005 +++ php-src/ext/ldap/config.m4 Mon Nov 21 14:06:04 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.39.2.5 2005/11/03 20:41:13 sniper Exp $ +dnl $Id: config.m4,v 1.39.2.6 2005/11/21 19:06:04 sniper Exp $ dnl AC_DEFUN([PHP_LDAP_CHECKS], [ @@ -99,7 +99,7 @@ PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) - elif test -e $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then + elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) elif test -f $LDAP_LIBDIR/libssldap50.$SHLIB_SUFFIX_NAME; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/odbc config.m4
sniper Mon Nov 21 14:07:03 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/ext/odbc config.m4 Log: MFH: test -e does not work with solaris http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.55.2.12r2=1.55.2.12.2.1ty=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.55.2.12 php-src/ext/odbc/config.m4:1.55.2.12.2.1 --- php-src/ext/odbc/config.m4:1.55.2.12Thu Apr 21 19:02:23 2005 +++ php-src/ext/odbc/config.m4 Mon Nov 21 14:07:03 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55.2.12 2005/04/21 23:02:23 sniper Exp $ +dnl $Id: config.m4,v 1.55.2.12.2.1 2005/11/21 19:07:03 sniper Exp $ dnl dnl @@ -336,9 +336,9 @@ ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_LIBS=-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil -if test -e $ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME; then +if test -f $ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME; then ODBC_LIBS=-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil -elif test -e $ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME; then +elif test -f $ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME; then ODBC_LIBS=-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
Hello Dmitry, and get the stupid macros out of that extension :-) marcus Monday, November 21, 2005, 3:08:23 PM, you wrote: Really, I just found it. :) But removing it make sense. Dmitry. -Original Message- From: Jani Taskinen [mailto:[EMAIL PROTECTED] Sent: Monday, November 21, 2005 4:56 PM To: Dmitry Stogov Cc: php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c How about 'rm -f main/php3_compat.h' ? :) --Jani On Mon, 21 Nov 2005, Dmitry Stogov wrote: dmitry Mon Nov 21 05:57:33 2005 EDT Modified files: /php-src/ext/reflection php_reflection.c Log: Fixed getParameters method http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1 =1.191r2=1.192ty=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.191 php-src/ext/reflection/php_reflection.c:1.192 --- php-src/ext/reflection/php_reflection.c:1.191 Fri Nov 18 17:59:07 2005 +++ php-src/ext/reflection/php_reflection.cMon Nov 21 05:57:28 2005 @@ -19,7 +19,7 @@ +- -+ */ -/* $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $ */ +/* $Id: php_reflection.c,v 1.192 2005/11/21 10:57:28 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -38,6 +38,11 @@ #include zend_ini.h #include zend_interfaces.h +/* Undefine getParameters macro defined in main/php3_compat.h */ +#ifdef getParameters # undef getParameters +#endif + /* Class entry pointers */ PHPAPI zend_class_entry *reflector_ptr; PHPAPI zend_class_entry *reflection_exception_ptr; @@ -4270,7 +4275,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v +1.192 2005/11/21 10:57:28 dmitry Exp $); php_info_print_table_end(); } /* }}} */ -- Give me your money at @ http://pecl.php.net/wishlist.php/sniper Donating money may make me happier and friendlier for a limited period! Death to all 4 letter abbreviations starting with P! Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in /ext/standard config.m4 /scripts Makefile.frag php-config.in phpize.m4 /scripts/man1 php-config.1.in
sniper Mon Nov 21 18:07:36 2005 EDT Modified files: /php-srcMakefile.global acinclude.m4 configure.in /php-src/ext/standard config.m4 /php-src/scriptsMakefile.frag php-config.in phpize.m4 /php-src/scripts/man1 php-config.1.in Log: - Fixed header installing under phpize builds http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.63r2=1.64ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.63 php-src/Makefile.global:1.64 --- php-src/Makefile.global:1.63Wed Nov 9 00:41:09 2005 +++ php-src/Makefile.global Mon Nov 21 18:07:31 2005 @@ -5,9 +5,6 @@ DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir) COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH) -CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/ -INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS) - all: $(all_targets) @echo @echo Build complete. @@ -45,6 +42,31 @@ @rm -f modules/*.la /dev/null 21 @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) +install-headers: + [EMAIL PROTECTED] test $(INSTALL_HEADERS); then + for i in $(INSTALL_HEADERS); do \ + i=`$(top_srcdir)/build/shtool path -d $$i`; \ + paths=$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + done; \ + $(mkinstalldirs) $$paths \ + echo Installing header files: $(INSTALL_ROOT)$(phpincludedir)/ \ + for i in $(INSTALL_HEADERS); do \ + if test $(PHP_PECL_EXTENSION); then \ + src=`echo $$i | $(SED) -e s#ext/$(PHP_PECL_EXTENSION)/##g`; \ + else \ + src=$$i; \ + fi; \ + if test -f $(top_srcdir)/$$src; then \ + $(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + elif test -f $(top_builddir)/$$src; then \ + $(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + else \ + (cd $(top_srcdir)/$$src $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + cd $(top_builddir)/$$src $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2/dev/null || true; \ + fi \ + done; \ + fi + test: all [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE) test -x $(PHP_EXECUTABLE); then \ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.336r2=1.337ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.336 php-src/acinclude.m4:1.337 --- php-src/acinclude.m4:1.336 Thu Oct 13 16:16:39 2005 +++ php-src/acinclude.m4Mon Nov 21 18:07:31 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.336 2005/10/13 20:16:39 rrichards Exp $ +dnl $Id: acinclude.m4,v 1.337 2005/11/21 23:07:31 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -971,6 +971,13 @@ EXT_CLI_STATIC=$EXT_CLI_STATIC $1 fi PHP_ADD_BUILD_DIR($ext_builddir) + +dnl Set for phpize builds only +dnl --- + if test $ext_builddir = .; then +PHP_PECL_EXTENSION=$1 +PHP_SUBST(PHP_PECL_EXTENSION) + fi ]) dnl @@ -2375,7 +2382,7 @@ ifelse([$2],[],[ for header_file in $1; do PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [ -INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $header_file +INSTALL_HEADERS=$INSTALL_HEADERS $header_file ]) done ], [ @@ -2383,7 +2390,7 @@ for header_file in $2; do hp_hf=$header_path/$header_file PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [ -INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $hp_hf +INSTALL_HEADERS=$INSTALL_HEADERS $hp_hf ]) done ]) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.593r2=1.594ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.593 php-src/configure.in:1.594 --- php-src/configure.in:1.593 Thu Nov 17 17:58:07 2005 +++ php-src/configure.inMon Nov 21 18:07:31 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.593 2005/11/17 22:58:07 helly Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.594 2005/11/21 23:07:31 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1188,7 +1188,7 @@ PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) -PHP_SUBST(INSTALL_EXT_HEADERS) +PHP_SUBST(INSTALL_HEADERS) old_CC=$CC @@ -1257,6 +1257,8 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) +PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/]) + PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c
[PHP-CVS] cvs: php-src(PHP_5_1) / Makefile.global acinclude.m4 configure.in /ext/standard config.m4 /scripts Makefile.frag php-config.in phpize.m4 /scripts/man1 php-config.1.in
sniper Mon Nov 21 18:08:03 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcMakefile.global acinclude.m4 configure.in /php-src/ext/standard config.m4 /php-src/scriptsMakefile.frag php-config.in phpize.m4 /php-src/scripts/man1 php-config.1.in Log: MFH: - Fixed header installing under phpize builds http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.57.2.1r2=1.57.2.2ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.1 php-src/Makefile.global:1.57.2.2 --- php-src/Makefile.global:1.57.2.1Wed Sep 14 13:57:32 2005 +++ php-src/Makefile.global Mon Nov 21 18:08:01 2005 @@ -5,9 +5,6 @@ DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir) COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH) -CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/ -INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS) - all: $(all_targets) @echo @echo Build complete. @@ -45,6 +42,31 @@ @rm -f modules/*.la /dev/null 21 @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) +install-headers: + [EMAIL PROTECTED] test $(INSTALL_HEADERS); then + for i in $(INSTALL_HEADERS); do \ + i=`$(top_srcdir)/build/shtool path -d $$i`; \ + paths=$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + done; \ + $(mkinstalldirs) $$paths \ + echo Installing header files: $(INSTALL_ROOT)$(phpincludedir)/ \ + for i in $(INSTALL_HEADERS); do \ + if test $(PHP_PECL_EXTENSION); then \ + src=`echo $$i | $(SED) -e s#ext/$(PHP_PECL_EXTENSION)/##g`; \ + else \ + src=$$i; \ + fi; \ + if test -f $(top_srcdir)/$$src; then \ + $(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + elif test -f $(top_builddir)/$$src; then \ + $(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + else \ + (cd $(top_srcdir)/$$src $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + cd $(top_builddir)/$$src $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2/dev/null || true; \ + fi \ + done; \ + fi + install-su: install-pear test: all http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.332.2.6r2=1.332.2.7ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.6 php-src/acinclude.m4:1.332.2.7 --- php-src/acinclude.m4:1.332.2.6 Thu Oct 13 16:33:40 2005 +++ php-src/acinclude.m4Mon Nov 21 18:08:01 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.6 2005/10/13 20:33:40 rrichards Exp $ +dnl $Id: acinclude.m4,v 1.332.2.7 2005/11/21 23:08:01 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -973,6 +973,13 @@ EXT_CLI_STATIC=$EXT_CLI_STATIC $1 fi PHP_ADD_BUILD_DIR($ext_builddir) + +dnl Set for phpize builds only +dnl --- + if test $ext_builddir = .; then +PHP_PECL_EXTENSION=$1 +PHP_SUBST(PHP_PECL_EXTENSION) + fi ]) dnl @@ -2379,7 +2386,7 @@ ifelse([$2],[],[ for header_file in $1; do PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [ -INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $header_file +INSTALL_HEADERS=$INSTALL_HEADERS $header_file ]) done ], [ @@ -2387,7 +2394,7 @@ for header_file in $2; do hp_hf=$header_path/$header_file PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [ -INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $hp_hf +INSTALL_HEADERS=$INSTALL_HEADERS $hp_hf ]) done ]) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.19r2=1.579.2.20ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.19 php-src/configure.in:1.579.2.20 --- php-src/configure.in:1.579.2.19 Fri Nov 18 04:51:39 2005 +++ php-src/configure.inMon Nov 21 18:08:02 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.19 2005/11/18 09:51:39 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.20 2005/11/21 23:08:02 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1129,7 +1129,7 @@ PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) -PHP_SUBST(INSTALL_EXT_HEADERS) +PHP_SUBST(INSTALL_HEADERS) old_CC=$CC @@ -1198,6 +1198,8 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) +PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/]) + PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c
hirokawaMon Nov 21 18:21:24 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
fixed #35307 unexpected header can be injected to mb_send_mail() (the patch
is made by masugata).
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.4r2=1.142.2.47.2.5ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.4
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.5
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.4 Sat Nov 19 01:39:39 2005
+++ php-src/ext/mbstring/mbstring.c Mon Nov 21 18:21:19 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.4 2005/11/19 06:39:39 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.5 2005/11/21 23:21:19 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3467,6 +3467,22 @@
* Sends an email message with MIME scheme
*/
#if HAVE_SENDMAIL
+#define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)
\
+ if (str[pos] == '\r' str[pos + 1] == '\n' (str[pos + 2] == ' ' ||
str[pos + 2] == '\t')) {\
+ pos += 3;
\
+ while (str[pos] == ' ' || str[pos] == '\t') { \
+ pos++;
\
+ } \
+ continue;
\
+ }
\
+ else if (str[pos] == '\n' (str[pos + 1] == ' ' || str[pos + 1] ==
'\t')) { \
+ pos += 2;
\
+ while (str[pos] == ' ' || str[pos] == '\t') { \
+ pos++;
\
+ }
\
+ continue;
\
+ }
\
+
PHP_FUNCTION(mb_send_mail)
{
int argc, n;
@@ -3482,6 +3498,8 @@
mbfl_memory_device device; /* automatic allocateable buffer for
additional header */
const mbfl_language *lang;
int err = 0;
+ char *to_r;
+ int to_len, i;
/* initialize */
mbfl_memory_device_init(device, 0, 0);
@@ -3508,6 +3526,32 @@
convert_to_string_ex(argv[0]);
if (Z_STRVAL_PP(argv[0])) {
to = Z_STRVAL_PP(argv[0]);
+ to_len = Z_STRLEN_PP(argv[0]);
+ if (to_len 0) {
+ to_r = estrndup(to, to_len);
+ for (; to_len; to_len--) {
+ if (!isspace((unsigned char) to_r[to_len - 1]))
{
+ break;
+ }
+ to_r[to_len - 1] = '\0';
+ }
+ for (i = 0; to_r[i]; i++) {
+ if (iscntrl((unsigned char) to_r[i])) {
+ /* According to RFC 822,
section 3.1.1 long headers may be
+separated into
+* parts using CRLF followed at least
one linear-white-space
+character ('\t' or ' ').
+* To prevent these separators from
being replaced with a space,
+we use the
+* SKIP_LONG_HEADER_SEP_MBSTRING to
skip over them.
+*/
+ SKIP_LONG_HEADER_SEP_MBSTRING(to_r, i);
+ to_r[i] = ' ';
+ }
+ }
+ } else {
+ to_r = to;
+ }
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Missing To:
field);
err = 1;
@@ -3606,12 +3650,15 @@
extra_cmd = php_escape_shell_cmd(extra_cmd);
}
- if (!err php_mail(to, subject, message, headers, extra_cmd
TSRMLS_CC)) {
+ if (!err php_mail(to_r, subject, message, headers, extra_cmd
TSRMLS_CC)) {
RETVAL_TRUE;
} else {
RETVAL_FALSE;
}
+ if (to_r != to) {
+ efree(to_r);
+ }
if (extra_cmd) {
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Mon Nov 21 19:29:34 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
/Gz and /RTC1 is for debug builds
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.50r2=1.51ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.50 php-src/win32/build/config.w32:1.51
--- php-src/win32/build/config.w32:1.50 Sun Nov 20 12:03:58 2005
+++ php-src/win32/build/config.w32 Mon Nov 21 19:29:30 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.50 2005/11/20 17:03:58 sebastian Exp $
+// $Id: config.w32,v 1.51 2005/11/22 00:29:30 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -88,8 +88,10 @@
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /GZ ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /GZ ');
+ }
}
if (VCVERS = 14) {
@@ -97,8 +99,10 @@
// disable annoying warnings
ADD_FLAG('CFLAGS', ' /wd4996 ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /RTC1 ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /RTC1 ');
+ }
}
// General link flags
--
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) /win32/build config.w32
fmk Mon Nov 21 19:29:56 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/win32/buildconfig.w32
Log:
/Gz and /RTC1 is for debug builds
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.40.2.3r2=1.40.2.4ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.3
php-src/win32/build/config.w32:1.40.2.4
--- php-src/win32/build/config.w32:1.40.2.3 Sun Nov 20 12:03:14 2005
+++ php-src/win32/build/config.w32 Mon Nov 21 19:29:56 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.3 2005/11/20 17:03:14 sebastian Exp $
+// $Id: config.w32,v 1.40.2.4 2005/11/22 00:29:56 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -89,8 +89,10 @@
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /GZ ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /GZ ');
+ }
}
if (VCVERS = 14) {
@@ -98,8 +100,10 @@
// disable annoying warnings
ADD_FLAG('CFLAGS', ' /wd4996 ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /RTC1 ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /RTC1 ');
+ }
}
// General link flags
--
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) / Makefile.global
mikeMon Nov 21 19:50:37 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcMakefile.global Log: - fix make install http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.57.2.2r2=1.57.2.3ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.2 php-src/Makefile.global:1.57.2.3 --- php-src/Makefile.global:1.57.2.2Mon Nov 21 18:08:01 2005 +++ php-src/Makefile.global Mon Nov 21 19:50:36 2005 @@ -43,7 +43,7 @@ @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) install-headers: - [EMAIL PROTECTED] test $(INSTALL_HEADERS); then + [EMAIL PROTECTED] test $(INSTALL_HEADERS); then \ for i in $(INSTALL_HEADERS); do \ i=`$(top_srcdir)/build/shtool path -d $$i`; \ paths=$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i; \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / Makefile.global
mikeMon Nov 21 19:51:24 2005 EDT Modified files: /php-srcMakefile.global Log: - MF51: fix make install http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.64r2=1.65ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.64 php-src/Makefile.global:1.65 --- php-src/Makefile.global:1.64Mon Nov 21 18:07:31 2005 +++ php-src/Makefile.global Mon Nov 21 19:51:24 2005 @@ -43,7 +43,7 @@ @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) install-headers: - [EMAIL PROTECTED] test $(INSTALL_HEADERS); then + [EMAIL PROTECTED] test $(INSTALL_HEADERS); then \ for i in $(INSTALL_HEADERS); do \ i=`$(top_srcdir)/build/shtool path -d $$i`; \ paths=$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i; \ -- 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/mysqli/tests 009.phpt
iliaa Mon Nov 21 20:57:07 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/mysqli/tests 009.phpt Log: Fixed test http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/009.phpt?r1=1.6.2.4r2=1.6.2.5ty=u Index: php-src/ext/mysqli/tests/009.phpt diff -u php-src/ext/mysqli/tests/009.phpt:1.6.2.4 php-src/ext/mysqli/tests/009.phpt:1.6.2.5 --- php-src/ext/mysqli/tests/009.phpt:1.6.2.4 Tue Nov 8 09:43:49 2005 +++ php-src/ext/mysqli/tests/009.phpt Mon Nov 21 20:57:02 2005 @@ -71,7 +71,7 @@ [4]= int(0) [5]= - int(0) + string(13) - [6]= int(100) } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c
Doesn't this problem exist in PHP_5_1 branch?
--Jani
On Mon, 21 Nov 2005, Rui Hirokawa wrote:
hirokawaMon Nov 21 18:21:24 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstringmbstring.c
Log:
fixed #35307 unexpected header can be injected to mb_send_mail() (the patch is
made by masugata).
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.4r2=1.142.2.47.2.5ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.4
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.5
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.4 Sat Nov 19 01:39:39 2005
+++ php-src/ext/mbstring/mbstring.c Mon Nov 21 18:21:19 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.4 2005/11/19 06:39:39 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.5 2005/11/21 23:21:19 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3467,6 +3467,22 @@
* Sends an email message with MIME scheme
*/
#if HAVE_SENDMAIL
+#define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)
\
+ if (str[pos] == '\r' str[pos + 1] == '\n' (str[pos + 2] == ' ' ||
str[pos + 2] == '\t')) {\
+ pos += 3;
\
+ while (str[pos] == ' ' || str[pos] == '\t') { \
+ pos++;
\
+ } \
+ continue;
\
+ }
\
+ else if (str[pos] == '\n' (str[pos + 1] == ' ' || str[pos + 1] ==
'\t')) { \
+ pos += 2;
\
+ while (str[pos] == ' ' || str[pos] == '\t') { \
+ pos++;
\
+ }
\
+ continue;
\
+ }
\
+
PHP_FUNCTION(mb_send_mail)
{
int argc, n;
@@ -3482,6 +3498,8 @@
mbfl_memory_device device; /* automatic allocateable buffer for
additional header */
const mbfl_language *lang;
int err = 0;
+ char *to_r;
+ int to_len, i;
/* initialize */
mbfl_memory_device_init(device, 0, 0);
@@ -3508,6 +3526,32 @@
convert_to_string_ex(argv[0]);
if (Z_STRVAL_PP(argv[0])) {
to = Z_STRVAL_PP(argv[0]);
+ to_len = Z_STRLEN_PP(argv[0]);
+ if (to_len 0) {
+ to_r = estrndup(to, to_len);
+ for (; to_len; to_len--) {
+ if (!isspace((unsigned char) to_r[to_len - 1]))
{
+ break;
+ }
+ to_r[to_len - 1] = '\0';
+ }
+ for (i = 0; to_r[i]; i++) {
+ if (iscntrl((unsigned char) to_r[i])) {
+ /* According to RFC 822,
section 3.1.1 long headers may be
+separated into
+* parts using CRLF followed at least
one linear-white-space
+character ('\t' or ' ').
+* To prevent these separators from
being replaced with a space,
+we use the
+* SKIP_LONG_HEADER_SEP_MBSTRING to
skip over them.
+*/
+ SKIP_LONG_HEADER_SEP_MBSTRING(to_r, i);
+ to_r[i] = ' ';
+ }
+ }
+ } else {
+ to_r = to;
+ }
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Missing To:
field);
err = 1;
@@ -3606,12 +3650,15 @@
extra_cmd = php_escape_shell_cmd(extra_cmd);
}
- if (!err php_mail(to, subject, message, headers, extra_cmd
TSRMLS_CC)) {
+ if (!err php_mail(to_r, subject, message, headers, extra_cmd
TSRMLS_CC)) {
RETVAL_TRUE;
} else {
RETVAL_FALSE;
}
+ if (to_r != to)
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard ftp_fopen_wrapper.c
iliaa Mon Nov 21 22:01:41 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
Fixed command error in ftp:// wrapper.
# Thanks to Stefan Esser for discovering the problem.
http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.1r2=1.85.2.2ty=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.1
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.2
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.1 Tue Oct 11 10:33:51 2005
+++ php-src/ext/standard/ftp_fopen_wrapper.cMon Nov 21 22:01:39 2005
@@ -18,7 +18,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.1 2005/10/11 14:33:51 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.2 2005/11/22 03:01:39 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -513,13 +513,13 @@
}
/* retrieve file */
- memcpy(tmp_line, RETR, 4);
+ memcpy(tmp_line, RETR, sizeof(RETR));
} else if (read_write == 2) {
/* Write new file */
- memcpy(tmp_line, STOR, 4);
+ memcpy(tmp_line, STOR, sizeof(STOR));
} else {
/* Append */
- memcpy(tmp_line, APPE, 4);
+ memcpy(tmp_line, APPE, sizeof(APPE));
}
php_stream_printf(stream TSRMLS_CC, %s %s\r\n, tmp_line,
(resource-path != NULL ? resource-path : /));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard ftp_fopen_wrapper.c
iliaa Mon Nov 21 22:01:59 2005 EDT
Modified files:
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
MFB51: Fixed command error in ftp:// wrapper.
http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.86r2=1.87ty=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.86
php-src/ext/standard/ftp_fopen_wrapper.c:1.87
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.86 Tue Oct 11 10:33:14 2005
+++ php-src/ext/standard/ftp_fopen_wrapper.cMon Nov 21 22:01:59 2005
@@ -18,7 +18,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.86 2005/10/11 14:33:14 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.87 2005/11/22 03:01:59 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -513,13 +513,13 @@
}
/* retrieve file */
- memcpy(tmp_line, RETR, 4);
+ memcpy(tmp_line, RETR, sizeof(RETR));
} else if (read_write == 2) {
/* Write new file */
- memcpy(tmp_line, STOR, 4);
+ memcpy(tmp_line, STOR, sizeof(STOR));
} else {
/* Append */
- memcpy(tmp_line, APPE, 4);
+ memcpy(tmp_line, APPE, sizeof(APPE));
}
php_stream_printf(stream TSRMLS_CC, %s %s\r\n, tmp_line,
(resource-path != NULL ? resource-path : /));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
