[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Jul 1 01:37:58 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.724r2=1.725ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.724 ZendEngine2/ChangeLog:1.725 --- ZendEngine2/ChangeLog:1.724 Thu Jun 30 01:34:14 2005 +++ ZendEngine2/ChangeLog Fri Jul 1 01:37:58 2005 @@ -1,3 +1,9 @@ +2005-06-30 Dmitry Stogov [EMAIL PROTECTED] + +* zend_API.c + zend_API.h: + Restored old behavior of zend_statup_module() + 2005-06-29 Stanislav Malyshev [EMAIL PROTECTED] * zend_execute.c @@ -9031,7 +9037,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.724 2005/06/30 05:34:14 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.725 2005/07/01 05:37:58 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -10755,7 +10761,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.724 2005/06/30 05:34:14 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.725 2005/07/01 05:37:58 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/date config.m4
derick Thu Jun 30 02:40:57 2005 EDT Modified files: /php-src/ext/date config.m4 Log: - Make the Netware guys happy by removing the config.nw.h define. http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.8r2=1.9ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.8 php-src/ext/date/config.m4:1.9 --- php-src/ext/date/config.m4:1.8 Sun Jun 19 19:36:18 2005 +++ php-src/ext/date/config.m4 Thu Jun 30 02:40:57 2005 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 2005/06/19 23:36:18 sniper Exp $ +dnl $Id: config.m4,v 1.9 2005/06/30 06:40:57 derick Exp $ dnl config.m4 for date extension sinclude(ext/date/lib/timelib.m4) @@ -15,8 +15,6 @@ cat $ext_builddir/lib/timelib_config.h EOF #if PHP_WIN32 # include config.w32.h -#elif defined(NETWARE) -# include config.nw.h #else # include php_config.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/posix config.m4 posix.c
derick Thu Jun 30 06:03:38 2005 EDT
Modified files:
/php-src/ext/posix config.m4 posix.c
Log:
- Added check for makedev systemcall, which Netware doesn't support.
http://cvs.php.net/diff.php/php-src/ext/posix/config.m4?r1=1.10r2=1.11ty=u
Index: php-src/ext/posix/config.m4
diff -u php-src/ext/posix/config.m4:1.10 php-src/ext/posix/config.m4:1.11
--- php-src/ext/posix/config.m4:1.10Mon Jun 6 18:04:14 2005
+++ php-src/ext/posix/config.m4 Thu Jun 30 06:03:36 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.10 2005/06/06 22:04:14 wez Exp $
+dnl $Id: config.m4,v 1.11 2005/06/30 10:03:36 derick Exp $
dnl
PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
@@ -11,5 +11,5 @@
AC_CHECK_HEADERS(sys/mkdev.h)
- AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo
mknod getrlimit getlogin getgroups)
+ AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo
mknod getrlimit getlogin getgroups makdev)
fi
http://cvs.php.net/diff.php/php-src/ext/posix/posix.c?r1=1.67r2=1.68ty=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.67 php-src/ext/posix/posix.c:1.68
--- php-src/ext/posix/posix.c:1.67 Mon Jun 6 18:04:14 2005
+++ php-src/ext/posix/posix.c Thu Jun 30 06:03:36 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.67 2005/06/06 22:04:14 wez Exp $ */
+/* $Id: posix.c,v 1.68 2005/06/30 10:03:36 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -143,7 +143,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, Revision, $Revision: 1.67 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.68 $);
php_info_print_table_end();
}
/* }}} */
@@ -698,7 +698,11 @@
expects argument 4 to be non-zero for
POSIX_S_IFCHR and POSIX_S_IFBLK);
RETURN_FALSE;
} else {
+#ifdef HAVE_MAKEDEV
php_dev = makedev(major, minor);
+#else
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Can not
create a block or character device, creating a normal file instead);
+#endif
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml.h simplexml.c /ext/standard array.c
sniper Thu Jun 30 07:15:00 2005 EDT
Modified files:
/php-src/ext/simplexml php_simplexml.h simplexml.c
/php-src/ext/standard array.c
Log:
- Unify (+ spl can't be build shared so COMPILE_DL_SPL
http://cvs.php.net/diff.php/php-src/ext/simplexml/php_simplexml.h?r1=1.18r2=1.19ty=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.18
php-src/ext/simplexml/php_simplexml.h:1.19
--- php-src/ext/simplexml/php_simplexml.h:1.18 Thu Feb 12 19:02:19 2004
+++ php-src/ext/simplexml/php_simplexml.h Thu Jun 30 07:14:56 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_simplexml.h,v 1.18 2004/02/13 00:02:19 fmk Exp $ */
+/* $Id: php_simplexml.h,v 1.19 2005/06/30 11:14:56 sniper Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -48,7 +48,7 @@
PHP_MINIT_FUNCTION(simplexml);
PHP_MSHUTDOWN_FUNCTION(simplexml);
-#if HAVE_SPL !defined(COMPILE_DL_SPL)
+#ifdef HAVE_SPL
PHP_RINIT_FUNCTION(simplexml);
#endif
PHP_MINFO_FUNCTION(simplexml);
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.148r2=1.149ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.148
php-src/ext/simplexml/simplexml.c:1.149
--- php-src/ext/simplexml/simplexml.c:1.148 Fri Jun 17 07:35:22 2005
+++ php-src/ext/simplexml/simplexml.c Thu Jun 30 07:14:56 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.148 2005/06/17 11:35:22 sniper Exp $ */
+/* $Id: simplexml.c,v 1.149 2005/06/30 11:14:56 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -34,7 +34,7 @@
#include php_simplexml_exports.h
#include zend_exceptions.h
#include zend_interfaces.h
-#if HAVE_SPL !defined(COMPILE_DL_SPL)
+#ifdef HAVE_SPL
#include ext/spl/spl_sxe.h
#endif
@@ -1709,7 +1709,7 @@
sxe_ze1_object_handlers.get_class_name =
zend_get_std_object_handlers()-get_class_name;
sxe_ze1_object_handlers.clone_obj = sxe_object_ze1_clone;
-#if HAVE_SPL !defined(COMPILE_DL_SPL)
+#ifdef HAVE_SPL
if (zend_get_module_started(spl) == SUCCESS) {
PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU);
}
@@ -1735,7 +1735,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.148 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.149 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.304r2=1.305ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.304 php-src/ext/standard/array.c:1.305
--- php-src/ext/standard/array.c:1.304 Tue Jun 21 08:10:51 2005
+++ php-src/ext/standard/array.cThu Jun 30 07:15:00 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.304 2005/06/21 12:10:51 dmitry Exp $ */
+/* $Id: array.c,v 1.305 2005/06/30 11:15:00 sniper Exp $ */
#include php.h
#include php_ini.h
@@ -46,7 +46,7 @@
#include php_string.h
#include php_rand.h
#include php_smart_str.h
-#if HAVE_SPL
+#ifdef HAVE_SPL
#include ext/spl/spl_array.h
#endif
@@ -319,7 +319,7 @@
RETURN_LONG (php_count_recursive (array, mode
TSRMLS_CC));
break;
case IS_OBJECT: {
-#if HAVE_SPL
+#ifdef HAVE_SPL
/* it the object implements Countable we call its
count() method */
zval *retval;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /netware/sys stat.h
Hey, CVS allows you to commit multiple files at one time. Please consider using that feature, as our mailboxes are now filled up with a tonne netware commits, making it hard to spot what others have been doing. --Wez. On 6/29/05, Anantha Kesari H Y [EMAIL PROTECTED] wrote: hyanantha Wed Jun 29 09:11:08 2005 EDT Removed files: /php-src/netware/sysstat.h Log: This file is not needed anymore -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql config.m4
sniper Thu Jun 30 10:15:53 2005 EDT Modified files: /php-src/ext/mysql config.m4 Log: consistent naming: prefix always with MYSQL_ http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.66r2=1.67ty=u Index: php-src/ext/mysql/config.m4 diff -u php-src/ext/mysql/config.m4:1.66 php-src/ext/mysql/config.m4:1.67 --- php-src/ext/mysql/config.m4:1.66Sat Jun 11 19:32:46 2005 +++ php-src/ext/mysql/config.m4 Thu Jun 30 10:15:51 2005 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.66 2005/06/11 23:32:46 sniper Exp $ +dnl $Id: config.m4,v 1.67 2005/06/30 14:15:51 sniper Exp $ dnl AC_DEFUN([MYSQL_LIB_CHK], [ - str=$MYSQL_DIR/$1/lib$MY_LIBNAME.* + str=$MYSQL_DIR/$1/lib$MYSQL_LIBNAME.* for j in `echo $str`; do if test -r $j; then MYSQL_LIB_DIR=$MYSQL_DIR/$1 @@ -86,10 +86,10 @@ Note that the MySQL client library is not bundled anymore!]) fi - MY_LIBNAME=mysqlclient + MYSQL_LIBNAME=mysqlclient case $host_alias in *netware*[)] - MY_LIBNAME=mysql + MYSQL_LIBNAME=mysql ;; esac @@ -98,15 +98,15 @@ done if test -z $MYSQL_LIB_DIR; then -AC_MSG_ERROR([Cannot find lib$MY_LIBNAME under $MYSQL_DIR. +AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. Note that the MySQL client library is not bundled anymore!]) fi - PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_close, [ ], + PHP_CHECK_LIBRARY($MYSQL_LIBNAME, mysql_close, [ ], [ if test $PHP_ZLIB_DIR != no; then PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [ + PHP_CHECK_LIBRARY($MYSQL_LIBNAME, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR @@ -114,7 +114,7 @@ MYSQL_LIBS=-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [ + PHP_CHECK_LIBRARY($MYSQL_LIBNAME, mysql_errno, [], [ AC_MSG_ERROR([Try adding --with-zlib-dir=DIR. Please check config.log for more information.]) ], [ -L$MYSQL_LIB_DIR @@ -125,13 +125,13 @@ -L$MYSQL_LIB_DIR ]) - PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($MYSQL_LIBNAME, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) PHP_ADD_INCLUDE($MYSQL_INC_DIR) PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) MYSQL_MODULE_TYPE=external - MYSQL_LIBS=-L$MYSQL_LIB_DIR -l$MY_LIBNAME $MYSQL_LIBS + MYSQL_LIBS=-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS MYSQL_INCLUDE=-I$MYSQL_INC_DIR PHP_SUBST(MYSQL_SHARED_LIBADD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/bcmath/libbcmath/src config.h /ext/mcve mcve.c /ext/pcre/pcrelib internal.h /ext/standard html.c /ext/xml expat_compat.h /main php_scandir.h php_sprintf.c
sniper Thu Jun 30 10:11:13 2005 EDT Modified files: /php-src/ext/bcmath/libbcmath/src config.h /php-src/ext/mcve mcve.c /php-src/ext/pcre/pcrelib internal.h /php-src/ext/standard html.c /php-src/ext/xmlexpat_compat.h /php-src/main php_scandir.h php_sprintf.c Log: Netware also uses autoconf based config now http://cvs.php.net/diff.php/php-src/ext/bcmath/libbcmath/src/config.h?r1=1.8r2=1.9ty=u Index: php-src/ext/bcmath/libbcmath/src/config.h diff -u php-src/ext/bcmath/libbcmath/src/config.h:1.8 php-src/ext/bcmath/libbcmath/src/config.h:1.9 --- php-src/ext/bcmath/libbcmath/src/config.h:1.8 Sun Jan 9 16:05:05 2005 +++ php-src/ext/bcmath/libbcmath/src/config.h Thu Jun 30 10:11:08 2005 @@ -1,7 +1,5 @@ #if PHP_WIN32 #include ../../../../main/config.w32.h -#elif defined(NETWARE) -#include config.nw.h #else #include php_config.h #endif http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.31r2=1.32ty=u Index: php-src/ext/mcve/mcve.c diff -u php-src/ext/mcve/mcve.c:1.31 php-src/ext/mcve/mcve.c:1.32 --- php-src/ext/mcve/mcve.c:1.31Mon Jun 6 12:43:23 2005 +++ php-src/ext/mcve/mcve.c Thu Jun 30 10:11:11 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mcve.c,v 1.31 2005/06/06 16:43:23 bradmssw Exp $ */ +/* $Id: mcve.c,v 1.32 2005/06/30 14:11:11 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -27,8 +27,6 @@ #if PHP_WIN32 #include config.w32.h -#elif defined NETWARE -#include config.nw.h #else #include php_config.h #endif http://cvs.php.net/diff.php/php-src/ext/pcre/pcrelib/internal.h?r1=1.17r2=1.18ty=u Index: php-src/ext/pcre/pcrelib/internal.h diff -u php-src/ext/pcre/pcrelib/internal.h:1.17 php-src/ext/pcre/pcrelib/internal.h:1.18 --- php-src/ext/pcre/pcrelib/internal.h:1.17Fri May 27 13:46:43 2005 +++ php-src/ext/pcre/pcrelib/internal.h Thu Jun 30 10:11:12 2005 @@ -47,8 +47,6 @@ #ifdef PHP_WIN32 # include config.w32.h -#elif defined(NETWARE) -# include config.nw.h #else # include php_config.h #endif http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.109r2=1.110ty=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.109 php-src/ext/standard/html.c:1.110 --- php-src/ext/standard/html.c:1.109 Wed May 11 08:54:29 2005 +++ php-src/ext/standard/html.c Thu Jun 30 10:11:12 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: html.c,v 1.109 2005/05/11 12:54:29 jorton Exp $ */ +/* $Id: html.c,v 1.110 2005/06/30 14:11:12 sniper Exp $ */ /* * HTML entity resources: @@ -34,8 +34,6 @@ #include php.h #if PHP_WIN32 #include config.w32.h -#elif defined NETWARE -#include config.nw.h #else #include php_config.h #endif http://cvs.php.net/diff.php/php-src/ext/xml/expat_compat.h?r1=1.17r2=1.18ty=u Index: php-src/ext/xml/expat_compat.h diff -u php-src/ext/xml/expat_compat.h:1.17 php-src/ext/xml/expat_compat.h:1.18 --- php-src/ext/xml/expat_compat.h:1.17 Fri Mar 25 22:13:57 2005 +++ php-src/ext/xml/expat_compat.h Thu Jun 30 10:11:13 2005 @@ -16,15 +16,13 @@ +--+ */ -/* $Id: expat_compat.h,v 1.17 2005/03/26 03:13:57 sniper Exp $ */ +/* $Id: expat_compat.h,v 1.18 2005/06/30 14:11:13 sniper Exp $ */ #ifndef PHP_EXPAT_COMPAT_H #define PHP_EXPAT_COMPAT_H #ifdef PHP_WIN32 #include config.w32.h -#elif defined(NETWARE) -#include config.nw.h #else #include php_config.h #endif http://cvs.php.net/diff.php/php-src/main/php_scandir.h?r1=1.10r2=1.11ty=u Index: php-src/main/php_scandir.h diff -u php-src/main/php_scandir.h:1.10 php-src/main/php_scandir.h:1.11 --- php-src/main/php_scandir.h:1.10 Sun Jan 9 16:05:06 2005 +++ php-src/main/php_scandir.h Thu Jun 30 10:11:13 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_scandir.h,v 1.10 2005/01/09 21:05:06 sniper Exp $ */ +/* $Id: php_scandir.h,v 1.11 2005/06/30 14:11:13 sniper Exp $ */ #ifndef PHP_SCANDIR_H #define PHP_SCANDIR_H @@ -31,8 +31,6 @@ #ifdef PHP_WIN32 #include config.w32.h #include win32/readdir.h -#elif NETWARE -#include config.nw.h #else #include php_config.h #endif http://cvs.php.net/diff.php/php-src/main/php_sprintf.c?r1=1.21r2=1.22ty=u Index: php-src/main/php_sprintf.c diff -u php-src/main/php_sprintf.c:1.21 php-src/main/php_sprintf.c:1.22 --- php-src/main/php_sprintf.c:1.21 Sun Jan 9 16:05:06 2005 +++ php-src/main/php_sprintf.c Thu Jun 30 10:11:13 2005 @@ -16,15 +16,13 @@ +--+ */ -/* $Id: php_sprintf.c,v 1.21 2005/01/09 21:05:06 sniper Exp $ */ +/* $Id: php_sprintf.c,v 1.22 2005/06/30 14:11:13 sniper Exp $ */ #include stdio.h #include stdarg.h #include php.h #ifdef PHP_WIN32 #include config.w32.h -#elif defined
[PHP-CVS] cvs: php-src /ext/standard dl.c
dmitry Thu Jun 30 09:43:00 2005 EDT
Modified files:
/php-src/ext/standard dl.c
Log:
Restored old behavior of zend_statup_module()
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.101r2=1.102ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.101 php-src/ext/standard/dl.c:1.102
--- php-src/ext/standard/dl.c:1.101 Fri Jun 17 05:39:21 2005
+++ php-src/ext/standard/dl.c Thu Jun 30 09:43:00 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.101 2005/06/17 09:39:21 dmitry Exp $ */
+/* $Id: dl.c,v 1.102 2005/06/30 13:43:00 dmitry Exp $ */
#include php.h
#include dl.h
@@ -224,7 +224,7 @@
RETURN_FALSE;
}
- if (type == MODULE_TEMPORARY zend_startup_module(module_entry
TSRMLS_CC) == FAILURE) {
+ if (type == MODULE_TEMPORARY zend_startup_module_ex(module_entry
TSRMLS_CC) == FAILURE) {
DL_UNLOAD(handle);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/posix config.m4
sniper Thu Jun 30 09:39:43 2005 EDT Modified files: /php-src/ext/posix config.m4 Log: typo http://cvs.php.net/diff.php/php-src/ext/posix/config.m4?r1=1.11r2=1.12ty=u Index: php-src/ext/posix/config.m4 diff -u php-src/ext/posix/config.m4:1.11 php-src/ext/posix/config.m4:1.12 --- php-src/ext/posix/config.m4:1.11Thu Jun 30 06:03:36 2005 +++ php-src/ext/posix/config.m4 Thu Jun 30 09:39:42 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2005/06/30 10:03:36 derick Exp $ +dnl $Id: config.m4,v 1.12 2005/06/30 13:39:42 sniper Exp $ dnl PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions, @@ -11,5 +11,5 @@ AC_CHECK_HEADERS(sys/mkdev.h) - AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makdev) + AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
wez Thu Jun 30 10:25:41 2005 EDT
Modified files:
/php-src/ext/opensslopenssl.c
Log:
Add optional parameter to openssl_pkcs7_verify() which specifies the name
of a file that will be filled with the verified data, but with the signature
information stripped.
Patch by Marton Kenyeres, mkenyeres (at) konvergencia dot hu
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.96r2=1.97ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.96 php-src/ext/openssl/openssl.c:1.97
--- php-src/ext/openssl/openssl.c:1.96 Tue Apr 19 18:04:25 2005
+++ php-src/ext/openssl/openssl.c Thu Jun 30 10:25:39 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.96 2005/04/19 22:04:25 sniper Exp $ */
+/* $Id: openssl.c,v 1.97 2005/06/30 14:25:39 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2152,7 +2152,7 @@
/* {{{ PKCS7 S/MIME functions */
-/* {{{ proto bool openssl_pkcs7_verify(string filename, long flags [, string
signerscerts [, array cainfo [, string extracerts]]])
+/* {{{ proto bool openssl_pkcs7_verify(string filename, long flags [, string
signerscerts [, array cainfo [, string extracerts [, string content)
Verifys that the data block is intact, the signer is who they say they are,
and returns the CERTs of the signers */
PHP_FUNCTION(openssl_pkcs7_verify)
{
@@ -2161,17 +2161,18 @@
STACK_OF(X509) *signers= NULL;
STACK_OF(X509) *others = NULL;
PKCS7 * p7 = NULL;
- BIO * in = NULL, * datain = NULL;
+ BIO * in = NULL, * datain = NULL, * dataout = NULL;
long flags = 0;
char * filename; int filename_len;
char * extracerts = NULL; int extracerts_len;
char * signersfilename = NULL; int signersfilename_len;
+ char * datafilename = NULL; int datafilename_len;
RETVAL_LONG(-1);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sl|sas,
filename, filename_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sl|sass,
filename, filename_len,
flags, signersfilename, signersfilename_len,
cainfo,
- extracerts, extracerts_len) == FAILURE) {
+ extracerts, extracerts_len, datafilename,
datafilename_len) == FAILURE) {
return;
}
@@ -2204,18 +2205,30 @@
#endif
goto clean_exit;
}
+
+ if (datafilename) {
+
+ if (php_openssl_safe_mode_chk(datafilename TSRMLS_CC)) {
+ goto clean_exit;
+ }
+
+ dataout = BIO_new_file(datafilename, w);
+ if (dataout == NULL) {
+ goto clean_exit;
+ }
+ }
#if DEBUG_SMIME
zend_printf(Calling PKCS7 verify\n);
#endif
- if (PKCS7_verify(p7, others, store, datain, NULL, flags)) {
+ if (PKCS7_verify(p7, others, store, datain, dataout, flags)) {
RETVAL_TRUE;
if (signersfilename) {
BIO *certout;
- if (php_openssl_safe_mode_chk(filename TSRMLS_CC)) {
+ if (php_openssl_safe_mode_chk(signersfilename
TSRMLS_CC)) {
goto clean_exit;
}
@@ -2242,6 +2255,7 @@
X509_STORE_free(store);
BIO_free(datain);
BIO_free(in);
+ BIO_free(dataout);
PKCS7_free(p7);
sk_X509_free(others);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite/sqlite/src parse.c
iliaa Thu Jun 30 16:59:22 2005 EDT Modified files: /php-src/ext/pdo_sqlite/sqlite/src parse.c Log: touch generated file. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite/src/parse.c?r1=1.5r2=1.6ty=u Index: php-src/ext/pdo_sqlite/sqlite/src/parse.c diff -u php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.5 php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.6 --- php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.5 Thu Jun 30 16:58:34 2005 +++ php-src/ext/pdo_sqlite/sqlite/src/parse.c Thu Jun 30 16:59:21 2005 @@ -1,5 +1,5 @@ /* Driver template for the LEMON parser generator. -** The author disclaims copyright to this source code. +** The author disclaims copyright to this source code. */ /* First off, code is include which follows the include declaration ** in the input file. */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
iliaa Thu Jun 30 17:00:37 2005 EDT Modified files: /php-srcNEWS Log: SQLite lib upgrade news. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1967r2=1.1968ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1967 php-src/NEWS:1.1968 --- php-src/NEWS:1.1967 Tue Jun 28 17:49:34 2005 +++ php-src/NEWSThu Jun 30 17:00:35 2005 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2005, PHP 5.1 Beta 3 +- Upgraded bundled SQLite library for PDO:SQLite to 3.2.2 (Ilia) - Added PDO_MYSQL_ATTR_USE_BUFFERED_QUERY parameter for pdo_mysql. (Ilia) - Fixed bug #33491 (crash after extending MySQLi internal class). (Tony) - Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/date php_date.c php_date.h /ext/date/lib dow.c parse_tz.c timelib.h timelib_structs.h timezonedb.h tm2unixtime.c unixtime2tm.c /ext/date/tests bug33452.phpt date.
derick Thu Jun 30 17:38:07 2005 EDT
Added files:
/php-src/ext/date/tests bug33452.phpt date.phpt
Removed files:
/php-src/ext/standard/tests/timedate.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date php_date.c php_date.h
/php-src/ext/date/lib dow.c parse_tz.c timelib.h timelib_structs.h
timezonedb.h tm2unixtime.c unixtime2tm.c
/php-src/ext/standard basic_functions.c datetime.c datetime.h
/php-src/ext/standard/tests/timebug27719.phpt
Log:
- Reimplemented date and gmdate with new timelib code.
- Removed old date/gmdate implementations.
- Moved date() related testcases to ext/date/tests.
- Implemented bug #33452.
- Fixed testcase for bug #27719 - there is no timezone called EST5DST.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1968r2=1.1969ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1968 php-src/NEWS:1.1969
--- php-src/NEWS:1.1968 Thu Jun 30 17:00:35 2005
+++ php-src/NEWSThu Jun 30 17:38:05 2005
@@ -3,6 +3,7 @@
?? ??? 2005, PHP 5.1 Beta 3
- Upgraded bundled SQLite library for PDO:SQLite to 3.2.2 (Ilia)
- Added PDO_MYSQL_ATTR_USE_BUFFERED_QUERY parameter for pdo_mysql. (Ilia)
+- Implemented feature request #33452 (Year belonging to ISO week). (Derick)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia)
- Fixed bug #33469 (Compile error undefined reference to ifx_checkAPI). (Jani)
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.13r2=1.14ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.13 php-src/ext/date/php_date.c:1.14
--- php-src/ext/date/php_date.c:1.13Sun Jun 19 18:15:25 2005
+++ php-src/ext/date/php_date.c Thu Jun 30 17:38:06 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.13 2005/06/19 22:15:25 derick Exp $ */
+/* $Id: php_date.c,v 1.14 2005/06/30 21:38:06 derick Exp $ */
#include php.h
#include php_streams.h
@@ -29,6 +29,8 @@
#include time.h
function_entry date_functions[] = {
+ PHP_FE(date, NULL)
+ PHP_FE(gmdate, NULL)
PHP_FE(strtotime, NULL)
{NULL, NULL, NULL}
};
@@ -85,6 +87,198 @@
php_info_print_table_end();
}
+/* =[ Helper functions ] == */
+
+static char* guess_timezone(TSRMLS_D)
+{
+ char *env;
+
+ env = getenv(TZ);
+ if (env) {
+ return env;
+ }
+ /* Check config setting */
+ if (DATEG(default_timezone)) {
+ return DATEG(default_timezone);
+ }
+ return GMT;
+}
+
+/* =[ date() and gmdate() ] */
+#include ext/standard/php_smart_str.h
+
+static char *mon_full_names[] = {
+ January, February, March, April,
+ May, June, July, August,
+ September, October, November, December
+};
+
+static char *mon_short_names[] = {
+ Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct,
Nov, Dec
+};
+
+static char *day_full_names[] = {
+ Sunday, Monday, Tuesday, Wednesday, Thursday, Friday,
Saturday
+};
+
+static char *day_short_names[] = {
+ Sun, Mon, Tue, Wed, Thu, Fri, Sat
+};
+
+static char *english_suffix(int number)
+{
+ if (number = 10 number = 19) {
+ return th;
+ } else {
+ switch (number % 10) {
+ case 1: return st;
+ case 2: return nd;
+ case 3: return rd;
+ }
+ }
+ return th;
+}
+
+static char *php_format_date(char *format, int format_len, timelib_time *t,
int localtime)
+{
+ smart_strstring = {0};
+ int i;
+ char buffer[33];
+ timelib_time_offset *offset;
+ timelib_sll isoweek, isoyear;
+
+ if (localtime) {
+ offset = timelib_get_time_zone_info(t-sse, t-tz_info);
+ }
+ buffer[32] = '\0';
+ timelib_isoweek_from_date(t-y, t-m, t-d, isoweek, isoyear);
+
+ for (i = 0; i format_len; i++) {
+ switch (format[i]) {
+ /* day */
+ case 'd': snprintf(buffer, 32, %02d, (int) t-d);
break;
+ case 'D': snprintf(buffer, 32, %s,
day_short_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'j': snprintf(buffer, 32, %d, (int) t-d);
break;
+ case 'l': snprintf(buffer, 32, %s,
day_full_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'S': snprintf(buffer, 32, %s,
english_suffix(t-d)); break;
+ case 'w': snprintf(buffer, 32, %d, (int)
timelib_day_of_week(t-y, t-m, t-d)); break;
+ case 'z':
[PHP-CVS] cvs: php-src / NEWS /ext/xmlrpc xmlrpc-epi-php.c
iliaa Thu Jun 30 18:29:38 2005 EDT
Modified files:
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-srcNEWS
Log:
Fixed bug #33523 (Memory leak in xmlrpc_encode_request()).
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.37r2=1.38ty=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.37
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.38
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.37Thu Jan 8 03:17:47 2004
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Thu Jun 30 18:29:33 2005
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.37 2004/01/08 08:17:47 andi Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.38 2005/06/30 22:29:33 iliaa Exp $ */
/**
* BUGS: *
@@ -667,6 +667,10 @@
XMLRPC_RequestFree(xRequest, 1);
}
}
+
+ if (out.xmlrpc_out.xml_elem_opts.encoding != ENCODING_DEFAULT) {
+ efree(out.xmlrpc_out.xml_elem_opts.encoding);
+ }
}
/* }}} */
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1969r2=1.1970ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1969 php-src/NEWS:1.1970
--- php-src/NEWS:1.1969 Thu Jun 30 17:38:05 2005
+++ php-src/NEWSThu Jun 30 18:29:36 2005
@@ -4,6 +4,7 @@
- Upgraded bundled SQLite library for PDO:SQLite to 3.2.2 (Ilia)
- Added PDO_MYSQL_ATTR_USE_BUFFERED_QUERY parameter for pdo_mysql. (Ilia)
- Implemented feature request #33452 (Year belonging to ISO week). (Derick)
+- Fixed bug #33523 (Memory leak in xmlrpc_encode_request()). (Ilia)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia)
- Fixed bug #33469 (Compile error undefined reference to ifx_checkAPI). (Jani)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
iliaa Thu Jun 30 18:44:29 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Fixed memory leak on error inside php_date().
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.14r2=1.15ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.14 php-src/ext/date/php_date.c:1.15
--- php-src/ext/date/php_date.c:1.14Thu Jun 30 17:38:06 2005
+++ php-src/ext/date/php_date.c Thu Jun 30 18:44:28 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.14 2005/06/30 21:38:06 derick Exp $ */
+/* $Id: php_date.c,v 1.15 2005/06/30 22:44:28 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -249,15 +249,16 @@
RETURN_FALSE;
}
-t = timelib_time_ctor();
+ t = timelib_time_ctor();
if (localtime) {
tzi = timelib_parse_tzfile(guess_timezone());
if (! tzi) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find any timezone setting);
+ timelib_time_dtor(t);
RETURN_FALSE;
}
- timelib_unixtime2local(t, ts, tzi);
+ timelib_unixtime2local(t, ts, tzi);
} else {
tzi = NULL;
timelib_unixtime2gmt(t, ts);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
iliaa Thu Jun 30 18:47:39 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Fixed compiler warnings.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.15 php-src/ext/date/php_date.c:1.16
--- php-src/ext/date/php_date.c:1.15Thu Jun 30 18:44:28 2005
+++ php-src/ext/date/php_date.c Thu Jun 30 18:47:39 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.15 2005/06/30 22:44:28 iliaa Exp $ */
+/* $Id: php_date.c,v 1.16 2005/06/30 22:47:39 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -156,55 +156,55 @@
for (i = 0; i format_len; i++) {
switch (format[i]) {
/* day */
- case 'd': snprintf(buffer, 32, %02d, (int) t-d);
break;
- case 'D': snprintf(buffer, 32, %s,
day_short_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
- case 'j': snprintf(buffer, 32, %d, (int) t-d);
break;
- case 'l': snprintf(buffer, 32, %s,
day_full_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
- case 'S': snprintf(buffer, 32, %s,
english_suffix(t-d)); break;
- case 'w': snprintf(buffer, 32, %d, (int)
timelib_day_of_week(t-y, t-m, t-d)); break;
- case 'z': snprintf(buffer, 32, %d, (int)
timelib_day_of_year(t-y, t-m, t-d)); break;
+ case 'd': snprintf(buffer, 32, %02d, (int) t-d);
break;
+ case 'D': snprintf(buffer, 32, %s,
day_short_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'j': snprintf(buffer, 32, %d, (int) t-d); break;
+ case 'l': snprintf(buffer, 32, %s,
day_full_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'S': snprintf(buffer, 32, %s,
english_suffix(t-d)); break;
+ case 'w': snprintf(buffer, 32, %d, (int)
timelib_day_of_week(t-y, t-m, t-d)); break;
+ case 'z': snprintf(buffer, 32, %d, (int)
timelib_day_of_year(t-y, t-m, t-d)); break;
/* week */
- case 'W': snprintf(buffer, 32, %d, (int) isoweek);
break; /* iso weeknr */
- case 'o': snprintf(buffer, 32, %d, (int) isoyear);
break; /* iso year */
+ case 'W': snprintf(buffer, 32, %d, (int) isoweek);
break; /* iso weeknr */
+ case 'o': snprintf(buffer, 32, %d, (int) isoyear);
break; /* iso year */
/* month */
- case 'F': snprintf(buffer, 32, %s,
mon_full_names[t-m - 1]); break;
- case 'm': snprintf(buffer, 32, %02d, (int) t-m);
break;
- case 'M': snprintf(buffer, 32, %s,
mon_short_names[t-m - 1]); break;
- case 'n': snprintf(buffer, 32, %d, (int) t-m);
break;
- case 't': snprintf(buffer, 32, %d, (int)
timelib_days_in_month(t-y, t-m)); break;
+ case 'F': snprintf(buffer, 32, %s,
mon_full_names[t-m - 1]); break;
+ case 'm': snprintf(buffer, 32, %02d, (int) t-m);
break;
+ case 'M': snprintf(buffer, 32, %s,
mon_short_names[t-m - 1]); break;
+ case 'n': snprintf(buffer, 32, %d, (int) t-m); break;
+ case 't': snprintf(buffer, 32, %d, (int)
timelib_days_in_month(t-y, t-m)); break;
/* year */
- case 'L': snprintf(buffer, 32, %d,
timelib_is_leap((int) t-y)); break;
- case 'y': snprintf(buffer, 32, %02d, (int) t-y %
100); break;
- case 'Y': snprintf(buffer, 32, %04d, (int) t-y);
break;
+ case 'L': snprintf(buffer, 32, %d,
timelib_is_leap((int) t-y)); break;
+ case 'y': snprintf(buffer, 32, %02d, (int) t-y %
100); break;
+ case 'Y': snprintf(buffer, 32, %04d, (int) t-y);
break;
/* time */
- case 'a': snprintf(buffer, 32, %s, t-h = 12 ? pm
: am); break;
- case 'A': snprintf(buffer, 32, %s, t-h = 12 ? PM
: AM); break;
- case 'B': snprintf(buffer, 32, [B unimplemented]);
break;
- case 'g': snprintf(buffer, 32, %d, (t-h % 12) ?
(int) t-h % 12 : 12); break;
- case 'G': snprintf(buffer, 32, %d, (int) t-h);
break;
- case 'h': snprintf(buffer, 32, %02d, (t-h % 12) ?
(int) t-h % 12 : 12); break;
- case 'H': snprintf(buffer, 32, %02d, (int) t-h);
break;
- case 'i': snprintf(buffer, 32, %02d, (int) t-i);
break;
- case
[PHP-CVS] cvs: php-src /ext/date php_date.c
fmk Thu Jun 30 18:49:48 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Fix ZTS build
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.16r2=1.17ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.16 php-src/ext/date/php_date.c:1.17
--- php-src/ext/date/php_date.c:1.16Thu Jun 30 18:47:39 2005
+++ php-src/ext/date/php_date.c Thu Jun 30 18:49:47 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.16 2005/06/30 22:47:39 iliaa Exp $ */
+/* $Id: php_date.c,v 1.17 2005/06/30 22:49:47 fmk Exp $ */
#include php.h
#include php_streams.h
@@ -252,7 +252,7 @@
t = timelib_time_ctor();
if (localtime) {
- tzi = timelib_parse_tzfile(guess_timezone());
+ tzi = timelib_parse_tzfile(guess_timezone(TSRMLS_C));
if (! tzi) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot
find any timezone setting);
timelib_time_dtor(t);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c timelib.h
fmk Thu Jun 30 19:03:38 2005 EDT Modified files: /php-src/ext/date/lib parse_date.c timelib.h Log: Fix Win32 build http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.17r2=1.18ty=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.17 php-src/ext/date/lib/parse_date.c:1.18 --- php-src/ext/date/lib/parse_date.c:1.17 Wed Jun 29 15:07:04 2005 +++ php-src/ext/date/lib/parse_date.c Thu Jun 30 19:03:36 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: parse_date.c,v 1.17 2005/06/29 19:07:04 derick Exp $ */ +/* $Id: parse_date.c,v 1.18 2005/06/30 23:03:36 fmk Exp $ */ #include timelib.h @@ -34,7 +34,6 @@ #endif #if defined(_MSC_VER) -# define strcasecmp stricmp # define strtoll(s, f, b) _atoi64(s) #elif !defined(HAVE_STRTOLL) # if defined(HAVE_ATOLL) http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib.h?r1=1.5r2=1.6ty=u Index: php-src/ext/date/lib/timelib.h diff -u php-src/ext/date/lib/timelib.h:1.5 php-src/ext/date/lib/timelib.h:1.6 --- php-src/ext/date/lib/timelib.h:1.5 Thu Jun 30 17:38:06 2005 +++ php-src/ext/date/lib/timelib.h Thu Jun 30 19:03:36 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: timelib.h,v 1.5 2005/06/30 21:38:06 derick Exp $ */ +/* $Id: timelib.h,v 1.6 2005/06/30 23:03:36 fmk Exp $ */ #ifndef __TIMELIB_H__ #define __TIMELIB_H__ @@ -34,6 +34,10 @@ #define LONG_MIN (- LONG_MAX - 1) #endif +#if defined(_MSC_VER) +#define strcasecmp stricmp +#endif + /* From dow.c */ timelib_sll timelib_day_of_week(timelib_sll y, timelib_sll m, timelib_sll d); timelib_sll timelib_day_of_year(timelib_sll y, timelib_sll m, timelib_sll d); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/date php_date.c
Hello Derick, Ilia,
why is this usign snprintf when the value is a string?
(e.g.: snprintf(buffer, 32, %s...) why not use stropy or similar?
best regards
marcus
Friday, July 1, 2005, 12:47:39 AM, you wrote:
iliaa Thu Jun 30 18:47:39 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Fixed compiler warnings.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.15 php-src/ext/date/php_date.c:1.16
--- php-src/ext/date/php_date.c:1.15Thu Jun 30 18:44:28 2005
+++ php-src/ext/date/php_date.c Thu Jun 30 18:47:39 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.15 2005/06/30 22:44:28 iliaa Exp $ */
+/* $Id: php_date.c,v 1.16 2005/06/30 22:47:39 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -156,55 +156,55 @@
for (i = 0; i format_len; i++) {
switch (format[i]) {
/* day */
- case 'd': snprintf(buffer, 32, %02d, (int) t-d);
break;
- case 'D': snprintf(buffer, 32, %s,
day_short_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
- case 'j': snprintf(buffer, 32, %d, (int) t-d);
break;
- case 'l': snprintf(buffer, 32, %s,
day_full_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
- case 'S': snprintf(buffer, 32, %s,
english_suffix(t-d)); break;
- case 'w': snprintf(buffer, 32, %d, (int)
timelib_day_of_week(t-y, t-m, t-d)); break;
- case 'z': snprintf(buffer, 32, %d, (int)
timelib_day_of_year(t-y, t-m, t-d)); break;
+ case 'd': snprintf(buffer, 32, %02d, (int) t-d);
break;
+ case 'D': snprintf(buffer, 32, %s,
day_short_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'j': snprintf(buffer, 32, %d, (int) t-d);
break;
+ case 'l': snprintf(buffer, 32, %s,
day_full_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'S': snprintf(buffer, 32, %s,
english_suffix(t-d)); break;
+ case 'w': snprintf(buffer, 32, %d, (int)
timelib_day_of_week(t-y, t-m, t-d)); break;
+ case 'z': snprintf(buffer, 32, %d, (int)
timelib_day_of_year(t-y, t-m, t-d)); break;
/* week */
- case 'W': snprintf(buffer, 32, %d, (int) isoweek);
break; /* iso weeknr */
- case 'o': snprintf(buffer, 32, %d, (int) isoyear);
break; /* iso year */
+ case 'W': snprintf(buffer, 32, %d, (int) isoweek);
break; /* iso weeknr */
+ case 'o': snprintf(buffer, 32, %d, (int) isoyear);
break; /* iso year */
/* month */
- case 'F': snprintf(buffer, 32, %s,
mon_full_names[t-m - 1]); break;
- case 'm': snprintf(buffer, 32, %02d, (int) t-m);
break;
- case 'M': snprintf(buffer, 32, %s,
mon_short_names[t-m - 1]); break;
- case 'n': snprintf(buffer, 32, %d, (int) t-m);
break;
- case 't': snprintf(buffer, 32, %d, (int)
timelib_days_in_month(t-y, t-m)); break;
+ case 'F': snprintf(buffer, 32, %s,
mon_full_names[t-m - 1]); break;
+ case 'm': snprintf(buffer, 32, %02d, (int) t-m);
break;
+ case 'M': snprintf(buffer, 32, %s,
mon_short_names[t-m - 1]); break;
+ case 'n': snprintf(buffer, 32, %d, (int) t-m);
break;
+ case 't': snprintf(buffer, 32, %d, (int)
timelib_days_in_month(t-y, t-m)); break;
/* year */
- case 'L': snprintf(buffer, 32, %d,
timelib_is_leap((int) t-y)); break;
- case 'y': snprintf(buffer, 32, %02d, (int) t-y %
100); break;
- case 'Y': snprintf(buffer, 32, %04d, (int) t-y);
break;
+ case 'L': snprintf(buffer, 32, %d,
timelib_is_leap((int) t-y)); break;
+ case 'y': snprintf(buffer, 32, %02d, (int) t-y %
100); break;
+ case 'Y': snprintf(buffer, 32, %04d, (int) t-y);
break;
/* time */
- case 'a': snprintf(buffer, 32, %s, t-h = 12 ?
pm : am); break;
- case 'A': snprintf(buffer, 32, %s, t-h = 12 ?
PM : AM); break;
- case 'B': snprintf(buffer, 32, [B unimplemented]);
break;
- case 'g': snprintf(buffer, 32, %d, (t-h % 12) ?
(int) t-h % 12 : 12); break;
- case 'G': snprintf(buffer, 32, %d, (int)
Re: [PHP-CVS] cvs: php-src /ext/date php_date.c
It looks like in most cases where %s is used it can be replaced with
mempcy(). I'll look into it tomorrow unless Derick get's to it first :-)
Ilia
Marcus Boerger wrote:
Hello Derick, Ilia,
why is this usign snprintf when the value is a string?
(e.g.: snprintf(buffer, 32, %s...) why not use stropy or similar?
best regards
marcus
Friday, July 1, 2005, 12:47:39 AM, you wrote:
iliaa Thu Jun 30 18:47:39 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Fixed compiler warnings.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.15 php-src/ext/date/php_date.c:1.16
--- php-src/ext/date/php_date.c:1.15Thu Jun 30 18:44:28 2005
+++ php-src/ext/date/php_date.c Thu Jun 30 18:47:39 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.15 2005/06/30 22:44:28 iliaa Exp $ */
+/* $Id: php_date.c,v 1.16 2005/06/30 22:47:39 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -156,55 +156,55 @@
for (i = 0; i format_len; i++) {
switch (format[i]) {
/* day */
- case 'd': snprintf(buffer, 32, %02d, (int) t-d);
break;
- case 'D': snprintf(buffer, 32, %s,
day_short_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
- case 'j': snprintf(buffer, 32, %d, (int) t-d);
break;
- case 'l': snprintf(buffer, 32, %s,
day_full_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
- case 'S': snprintf(buffer, 32, %s,
english_suffix(t-d)); break;
- case 'w': snprintf(buffer, 32, %d, (int)
timelib_day_of_week(t-y, t-m, t-d)); break;
- case 'z': snprintf(buffer, 32, %d, (int)
timelib_day_of_year(t-y, t-m, t-d)); break;
+ case 'd': snprintf(buffer, 32, %02d, (int) t-d);
break;
+ case 'D': snprintf(buffer, 32, %s,
day_short_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'j': snprintf(buffer, 32, %d, (int) t-d); break;
+ case 'l': snprintf(buffer, 32, %s,
day_full_names[timelib_day_of_week(t-y, t-m, t-d)]); break;
+ case 'S': snprintf(buffer, 32, %s,
english_suffix(t-d)); break;
+ case 'w': snprintf(buffer, 32, %d, (int)
timelib_day_of_week(t-y, t-m, t-d)); break;
+ case 'z': snprintf(buffer, 32, %d, (int)
timelib_day_of_year(t-y, t-m, t-d)); break;
/* week */
- case 'W': snprintf(buffer, 32, %d, (int) isoweek);
break; /* iso weeknr */
- case 'o': snprintf(buffer, 32, %d, (int) isoyear);
break; /* iso year */
+ case 'W': snprintf(buffer, 32, %d, (int) isoweek);
break; /* iso weeknr */
+ case 'o': snprintf(buffer, 32, %d, (int) isoyear);
break; /* iso year */
/* month */
- case 'F': snprintf(buffer, 32, %s,
mon_full_names[t-m - 1]); break;
- case 'm': snprintf(buffer, 32, %02d, (int) t-m);
break;
- case 'M': snprintf(buffer, 32, %s,
mon_short_names[t-m - 1]); break;
- case 'n': snprintf(buffer, 32, %d, (int) t-m);
break;
- case 't': snprintf(buffer, 32, %d, (int)
timelib_days_in_month(t-y, t-m)); break;
+ case 'F': snprintf(buffer, 32, %s,
mon_full_names[t-m - 1]); break;
+ case 'm': snprintf(buffer, 32, %02d, (int) t-m);
break;
+ case 'M': snprintf(buffer, 32, %s,
mon_short_names[t-m - 1]); break;
+ case 'n': snprintf(buffer, 32, %d, (int) t-m); break;
+ case 't': snprintf(buffer, 32, %d, (int)
timelib_days_in_month(t-y, t-m)); break;
/* year */
- case 'L': snprintf(buffer, 32, %d,
timelib_is_leap((int) t-y)); break;
- case 'y': snprintf(buffer, 32, %02d, (int) t-y %
100); break;
- case 'Y': snprintf(buffer, 32, %04d, (int) t-y);
break;
+ case 'L': snprintf(buffer, 32, %d,
timelib_is_leap((int) t-y)); break;
+ case 'y': snprintf(buffer, 32, %02d, (int) t-y %
100); break;
+ case 'Y': snprintf(buffer, 32, %04d, (int) t-y);
break;
/* time */
- case 'a': snprintf(buffer, 32, %s, t-h = 12 ? pm :
am); break;
- case 'A': snprintf(buffer, 32, %s, t-h = 12 ? PM :
AM); break;
- case 'B': snprintf(buffer, 32, [B unimplemented]);
break;
- case 'g': snprintf(buffer, 32, %d, (t-h % 12) ? (int)
t-h
[PHP-CVS] cvs: php-src /ext/date php_date.c
iliaa Thu Jun 30 19:33:39 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
Fixed memory leak.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.17r2=1.18ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.17 php-src/ext/date/php_date.c:1.18
--- php-src/ext/date/php_date.c:1.17Thu Jun 30 18:49:47 2005
+++ php-src/ext/date/php_date.c Thu Jun 30 19:33:37 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.17 2005/06/30 22:49:47 fmk Exp $ */
+/* $Id: php_date.c,v 1.18 2005/06/30 23:33:37 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -233,6 +233,10 @@
smart_str_0(string);
+ if (localtime) {
+ timelib_time_offset_dtor(offset);
+ }
+
return string.c;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard proc_open.c
hyanantha Fri Jul 1 01:53:06 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard proc_open.c
Log:
As fork implementation of NetWare LibC still in experimental stages making
the procve based solution ahead of HAVE_FORK. Later When fork becomes stable
will revert this fix.
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.28.2.4r2=1.28.2.5ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.28.2.4
php-src/ext/standard/proc_open.c:1.28.2.5
--- php-src/ext/standard/proc_open.c:1.28.2.4 Thu Apr 7 19:08:48 2005
+++ php-src/ext/standard/proc_open.cFri Jul 1 01:53:06 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.28.2.4 2005/04/07 23:08:48 iliaa Exp $ */
+/* $Id: proc_open.c,v 1.28.2.5 2005/07/01 05:53:06 hyanantha Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -35,6 +35,11 @@
#include php_globals.h
#include SAPI.h
+#ifdef NETWARE
+#include proc.h
+#include library.h
+#endif
+
#if HAVE_SYS_WAIT_H
#include sys/wait.h
#endif
@@ -486,6 +491,13 @@
char *command_with_cmd;
UINT old_error_mode;
#endif
+#ifdef NETWARE
+ char** child_argv = NULL;
+ char* command_dup = NULL;
+ char* orig_cwd = NULL;
+ int command_num_args = 0;
+ wiring_t channel;
+#endif
php_process_id_t child;
struct php_process_handle *proc;
int is_persistent = 0; /* TODO: ensure that persistent procs will work
*/
@@ -749,6 +761,46 @@
child = pi.hProcess;
CloseHandle(pi.hThread);
+#elif defined(NETWARE)
+ if (cwd) {
+ orig_cwd = getcwd(NULL, PATH_MAX);
+ chdir2(cwd);
+ }
+ channel.infd = descriptors[0].childend;
+ channel.outfd = descriptors[1].childend;
+ channel.errfd = -1;
+ /* Duplicate the command as processing downwards will modify it*/
+ command_dup = strdup(command);
+ /* get a number of args */
+ construct_argc_argv(command_dup, NULL, command_num_args, NULL);
+ child_argv = (char**) malloc((command_num_args + 1) * sizeof(char*));
+ if(!child_argv) {
+ free(command_dup);
+ if (cwd orig_cwd) {
+ chdir2(orig_cwd);
+ free(orig_cwd);
+ }
+ }
+ /* fill the child arg vector */
+ construct_argc_argv(command_dup, NULL, command_num_args, child_argv);
+ child_argv[command_num_args] = NULL;
+ child = procve(child_argv[0], PROC_DETACHED|PROC_INHERIT_CWD, NULL,
channel, NULL, NULL, 0, NULL, (const char**)child_argv);
+ free(child_argv);
+ free(command_dup);
+ if (cwd orig_cwd) {
+ chdir2(orig_cwd);
+ free(orig_cwd);
+ }
+ if (child 0) {
+ /* failed to fork() */
+ /* clean up all the descriptors */
+ for (i = 0; i ndesc; i++) {
+ close(descriptors[i].childend);
+ close(descriptors[i].parentend);
+ }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, procve failed -
%s, strerror(errno));
+ goto exit_fail;
+ }
#elif HAVE_FORK
/* the unix way */
child = fork();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
