[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Sat Jun 14 20:30:56 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1346 php4/ChangeLog:1.1347 --- php4/ChangeLog:1.1346 Fri Jun 13 20:31:07 2003 +++ php4/ChangeLog Sat Jun 14 20:30:55 2003 @@ -1,3 +1,164 @@ +2003-06-14 Marcus Boerger [EMAIL PROTECTED] + +* ext/standard/tests/serialize/005.phpt: + No more namespaces + +* ext/standard/file.c + main/streams/streams.c: + Fix ZTS mode (hopefully all is working fine now again) + +* (PHP_4_3) + ext/dba/dba.c: + Remove that old thing + +2003-06-14 Edin Kadribasic [EMAIL PROTECTED] + +* (PHP_4_3) + ext/dba/dba.c: + Fixed win32 build + +2003-06-14 Sergey Kartashoff [EMAIL PROTECTED] + +* (PHP_4_3) + ext/mnogosearch/php_mnogo.c + ext/mnogosearch/php_mnogo.h: + - Mnogosearch extension updated. Now can compile with mnogosearch-3.2.11+ + +2003-06-14 Rob Richards [EMAIL PROTECTED] + +* ext/dom/php_dom.c + ext/dom/xml_common.h: + use xmlInitParser instead of xmlInitThreads + reentrant safe as well no need for xml_parser_inited + +* ext/xml/xml.c: + use xmlInitParser instead of xmlInitThreads + reentrant safe as well + +2003-06-14 Daniela Mariaschi [EMAIL PROTECTED] + +* (PHP_4_3) + ext/interbase/interbase.c + ext/interbase/php_interbase.h + ext/interbase/tests/005.phpt + ext/interbase/tests/interbase.inc: + MFH: Added IBASE_REC_VERSION/IBASE_REC_NO_VERSION transaction constants + +2003-06-14 Marcus Boerger [EMAIL PROTECTED] + +* ext/db/db.c: + Correct license again + +* ext/standard/file.c: + Fix ZTS mode + +2003-06-14 Tomas V.V.Cox [EMAIL PROTECTED] + +* pear/PEAR/Command/Package.php: + Fix some typos in makerpm and removed unused debug code + +2003-06-14 Marcus Boerger [EMAIL PROTECTED] + +* ext/db/CREDITS + ext/db/db.c + ext/db/package.xml + ext/db/php_db.h: + Update before moving to PECL + +2003-06-14 Daniela Mariaschi [EMAIL PROTECTED] + +* ext/interbase/tests/005.phpt + ext/interbase/tests/interbase.inc: + Added test for IBASE_REC_VERSION/IBASE_REC_NO_VERSION trans constants + +* ext/interbase/interbase.c + ext/interbase/php_interbase.h: + Added IBASE_REC_VERSION/IBASE_REC_NO_VERSION transaction constants + required from bugs #8797 #23887 + (added IBASE_WRITE, IBASE_WAIT, IBASE_CONCURRENCY just for clarity) + +2003-06-14 Rob Richards [EMAIL PROTECTED] + +* ext/xsl/xsltprocessor.c: + interoperability support + +* ext/dom/php_dom.c + ext/dom/xml_common.h: + fix xml_parser_inited on win32 + add common structs for better interoprability + +2003-06-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Bug fixing news + +2003-06-14 Rob Richards [EMAIL PROTECTED] + +* ext/xml/xml.c: + fix common libxml init and deinit routines + +2003-06-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + main/main.c + main/php_variables.c: + MFH: Fixed bug #24007 (Problem with register_globals arrays) + +* main/main.c + main/php_variables.c: + Fixed bug #24007 (Problem with register_globals arrays) + +2003-06-14 Jani Taskinen [EMAIL PROTECTED] + +* ext/dba/config.m4: + - Fixed some /usr/lib leaks into LIBS/LDFLAGS which later on made other +configure checks fail (old libs in /usr/lib, new ones in /opt/lib :) + +2003-06-14 Marcus Boerger [EMAIL PROTECTED] + +* ext/dom/config.m4 + ext/domxml/config.m4: + Improve/fix preventing both enabled + +2003-06-14 Jani Taskinen [EMAIL PROTECTED] + +* ext/ncurses/ncurses_functions.c: + Fix compile failure. + +* ext/cpdf/config.m4: + - Fixed some build problems (/usr/lib leaked in to LDFLAGS/LIBS) + - Made this extension to be possible to be build as shared. + +2003-06-14 Marcus Boerger [EMAIL PROTECTED] + +* ext/dom/config.m4 + ext/domxml/config.m4: + Don't allow both and mark the old one as deprecated + +2003-06-14 Rob Richards [EMAIL PROTECTED] + +* ext/xml/xml.c: + export xml_parser_inited under win32 + +2003-06-14 Frank M. Kromann [EMAIL PROTECTED] + +* ext/dbx/dbx_fbsql.c + ext/dbx/dbx_fbsql.c + ext/dbx/dbx_fbsql.h + ext/dbx/dbx_fbsql.h + ext/fbsql/php_fbsql.c + ext/fbsql/php_fbsql.c + ext/fbsql/php_fbsql.h + ext/fbsql/php_fbsql.h + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c + ext/mssql/php_mssql.h + ext/mssql/php_mssql.h + ext/odbc/php_odbc.c + ext/odbc/php_odbc.c: + Updating email address + 2003-06-13 Sara Golemon [EMAIL PROTECTED] * ext/standard/user_filters.c:
[PHP-CVS] cvs: php4 /ext/xml xml.c
rrichards Sat Jun 14 07:22:13 2003 EDT Modified files: /php4/ext/xml xml.c Log: export xml_parser_inited under win32 Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.130 php4/ext/xml/xml.c:1.131 --- php4/ext/xml/xml.c:1.130Tue Jun 10 16:03:40 2003 +++ php4/ext/xml/xml.c Sat Jun 14 07:22:13 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: xml.c,v 1.130 2003/06/10 20:03:40 imajes Exp $ */ +/* $Id: xml.c,v 1.131 2003/06/14 11:22:13 rrichards Exp $ */ #define IS_EXT_MODULE @@ -35,10 +35,10 @@ #if HAVE_XML -int xml_parser_inited = 0; - #include php_xml.h # include ext/standard/head.h + +PHP_XML_API int xml_parser_inited = 0; /* Short-term TODO list: * - Implement XML_ExternalEntityParserCreate() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dom config.m4 /ext/domxml config.m4
helly Sat Jun 14 07:27:50 2003 EDT Modified files: /php4/ext/dom config.m4 /php4/ext/domxmlconfig.m4 Log: Don't allow both and mark the old one as deprecated Index: php4/ext/dom/config.m4 diff -u php4/ext/dom/config.m4:1.1 php4/ext/dom/config.m4:1.2 --- php4/ext/dom/config.m4:1.1 Thu Jun 5 13:06:52 2003 +++ php4/ext/dom/config.m4 Sat Jun 14 07:27:49 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.1 2003/06/05 17:06:52 rrichards Exp $ +dnl $Id: config.m4,v 1.2 2003/06/14 11:27:49 helly Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -22,6 +22,10 @@ PHP_ARG_WITH(dom5, for DOM support, [ --with-dom5[=DIR] Include new DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) + +if test $PHP_DOM != no -a $PHP_DOM5 != no; then +AC_MSG_ERROR([Either use deprecated dom or new dom5 extension.]) +fi if test -z $PHP_ZLIB_DIR; then PHP_ARG_WITH(zlib-dir, for the location of libz, Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.47 php4/ext/domxml/config.m4:1.48 --- php4/ext/domxml/config.m4:1.47 Wed Jun 11 15:25:32 2003 +++ php4/ext/domxml/config.m4 Sat Jun 14 07:27:49 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47 2003/06/11 19:25:32 rrichards Exp $ +dnl $Id: config.m4,v 1.48 2003/06/14 11:27:49 helly Exp $ dnl AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[ @@ -37,8 +37,12 @@ ]) PHP_ARG_WITH(dom, for DOM support, -[ --with-dom[=DIR]Include DOM support (requires libxml = 2.4.14). +[ --with-dom[=DIR]Old deprecated DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) + +if test $PHP_DOM != no -a $PHP_DOM5 != no; then +AC_MSG_ERROR([Either use deprecated dom or new dom5 extension.]) +fi if test $PHP_DOM != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/cpdf config.m4
sniper Sat Jun 14 08:57:38 2003 EDT Modified files: /php4/ext/cpdf config.m4 Log: - Fixed some build problems (/usr/lib leaked in to LDFLAGS/LIBS) - Made this extension to be possible to be build as shared. Index: php4/ext/cpdf/config.m4 diff -u php4/ext/cpdf/config.m4:1.13 php4/ext/cpdf/config.m4:1.14 --- php4/ext/cpdf/config.m4:1.13Wed Apr 30 06:22:56 2003 +++ php4/ext/cpdf/config.m4 Sat Jun 14 08:57:38 2003 @@ -1,91 +1,82 @@ -dnl $Id: config.m4,v 1.13 2003/04/30 10:22:56 sniper Exp $ - -AC_DEFUN(CPDF_TEMP_SUBST,[ - old_LIBS=$LIBS - $1 - LIBS=$old_LIBS -]) +dnl $Id: config.m4,v 1.14 2003/06/14 12:57:38 sniper Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ - CPDF_TEMP_SUBST([ -AC_ARG_WITH(jpeg-dir, -[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ - for i in $withval /usr/local /usr; do -if test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a; then - CPDF_JPEG_DIR=$i - break; -fi - done - if test -z $CPDF_JPEG_DIR; then -AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)]) -AC_MSG_ERROR([libjpeg.(a|so) not found.]) + AC_ARG_WITH(jpeg-dir, + [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ +for i in $withval /usr/local /usr; do + if test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a; then +CPDF_JPEG_DIR=$i +break; fi - LIBS=$LIBS -L$CPDF_JPEG_DIR/lib -],) -AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_ERROR(Problem with libjpeg.(a|so). Please check config.log for more information.)],) +done if test -z $CPDF_JPEG_DIR; then - PHP_ADD_LIBRARY(jpeg) -else - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib) + AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)]) + AC_MSG_ERROR([libjpeg.(a|so) not found.]) fi - ]) +PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [ + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) +] ,[ + AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.]) +], [ + -L$CPDF_JPEG_DIR/lib +]) + ],) ]) AC_DEFUN(CPDF_TIFF_TEST,[ - CPDF_TEMP_SUBST([ -AC_ARG_WITH(tiff-dir, -[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ - for i in $withval /usr/local /usr; do -if test -f $i/lib/libtiff.$SHLIB_SUFFIX_NAME -o -f $i/lib/libtiff.a; then - CPDF_TIFF_DIR=$i - break; -fi - done - if test -z $CPDF_TIFF_DIR; then -AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)]) -AC_MSG_ERROR([libtiff.(a|so) not found.]) + AC_ARG_WITH(tiff-dir, + [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ +for i in $withval /usr/local /usr; do + if test -f $i/lib/libtiff.$SHLIB_SUFFIX_NAME -o -f $i/lib/libtiff.a; then +CPDF_TIFF_DIR=$i +break; fi - LIBS=$LIBS -L$CPDF_TIFF_DIR/lib -],) -AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_ERROR(Problem with libtiff.(a|so). Please check config.log for more information.)],) +done if test -z $CPDF_TIFF_DIR; then - PHP_ADD_LIBRARY(tiff) -else - PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib) + AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)]) + AC_MSG_ERROR([libtiff.(a|so) not found.]) fi - ]) +PHP_CHECK_LIBRARY(tiff, TIFFOpen, [ + PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) +] ,[ + AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.]) +], [ + -L$CPDF_TIFF_DIR/lib +]) + ],) ]) AC_MSG_CHECKING(for cpdflib support) AC_ARG_WITH(cpdflib, [ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).], [ - if test $withval = no; then -AC_MSG_RESULT(no) - else -AC_MSG_RESULT(yes) -PHP_NEW_EXTENSION(cpdf, cpdf.c) + PHP_WITH_SHARED + if test $withval != no; then +PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared) +PHP_SUBST(CPDF_SHARED_LIBADD) + CPDF_JPEG_TEST CPDF_TIFF_TEST + for i in $withval /usr /usr/local; do if test -f $i/include/cpdflib.h; then CPDFLIB_INCLUDE=$i/include AC_MSG_CHECKING(for cpdflib.h) AC_MSG_RESULT([in $i/include]) -CPDF_TEMP_SUBST([ - LIBS=$LIBS -L$i/lib - AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], -[AC_MSG_ERROR([Cpdflib module requires cpdflib = 2.])]) -]) -if test $i != /usr -a $i != /usr/local; then - PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib) + +PHP_CHECK_LIBRARY(cpdf, cpdf_open, [ PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) -else - PHP_ADD_LIBRARY(cpdf) -fi + PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) +
[PHP-CVS] cvs: php4(PHP_4_3) /ext/cpdf config.m4
sniper Sat Jun 14 08:58:18 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/cpdf config.m4 Log: MFH Index: php4/ext/cpdf/config.m4 diff -u php4/ext/cpdf/config.m4:1.10.4.2 php4/ext/cpdf/config.m4:1.10.4.3 --- php4/ext/cpdf/config.m4:1.10.4.2Wed Apr 30 06:23:06 2003 +++ php4/ext/cpdf/config.m4 Sat Jun 14 08:58:18 2003 @@ -1,91 +1,82 @@ -dnl $Id: config.m4,v 1.10.4.2 2003/04/30 10:23:06 sniper Exp $ - -AC_DEFUN(CPDF_TEMP_SUBST,[ - old_LIBS=$LIBS - $1 - LIBS=$old_LIBS -]) +dnl $Id: config.m4,v 1.10.4.3 2003/06/14 12:58:18 sniper Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ - CPDF_TEMP_SUBST([ -AC_ARG_WITH(jpeg-dir, -[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ - for i in $withval /usr/local /usr; do -if test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a; then - CPDF_JPEG_DIR=$i - break; -fi - done - if test -z $CPDF_JPEG_DIR; then -AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)]) -AC_MSG_ERROR([libjpeg.(a|so) not found.]) + AC_ARG_WITH(jpeg-dir, + [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ +for i in $withval /usr/local /usr; do + if test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a; then +CPDF_JPEG_DIR=$i +break; fi - LIBS=$LIBS -L$CPDF_JPEG_DIR/lib -],) -AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_ERROR(Problem with libjpeg.(a|so). Please check config.log for more information.)],) +done if test -z $CPDF_JPEG_DIR; then - PHP_ADD_LIBRARY(jpeg) -else - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib) + AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)]) + AC_MSG_ERROR([libjpeg.(a|so) not found.]) fi - ]) +PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [ + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) +] ,[ + AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.]) +], [ + -L$CPDF_JPEG_DIR/lib +]) + ],) ]) AC_DEFUN(CPDF_TIFF_TEST,[ - CPDF_TEMP_SUBST([ -AC_ARG_WITH(tiff-dir, -[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ - for i in $withval /usr/local /usr; do -if test -f $i/lib/libtiff.$SHLIB_SUFFIX_NAME -o -f $i/lib/libtiff.a; then - CPDF_TIFF_DIR=$i - break; -fi - done - if test -z $CPDF_TIFF_DIR; then -AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)]) -AC_MSG_ERROR([libtiff.(a|so) not found.]) + AC_ARG_WITH(tiff-dir, + [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ +for i in $withval /usr/local /usr; do + if test -f $i/lib/libtiff.$SHLIB_SUFFIX_NAME -o -f $i/lib/libtiff.a; then +CPDF_TIFF_DIR=$i +break; fi - LIBS=$LIBS -L$CPDF_TIFF_DIR/lib -],) -AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_ERROR(Problem with libtiff.(a|so). Please check config.log for more information.)],) +done if test -z $CPDF_TIFF_DIR; then - PHP_ADD_LIBRARY(tiff) -else - PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib) + AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)]) + AC_MSG_ERROR([libtiff.(a|so) not found.]) fi - ]) +PHP_CHECK_LIBRARY(tiff, TIFFOpen, [ + PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) +] ,[ + AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.]) +], [ + -L$CPDF_TIFF_DIR/lib +]) + ],) ]) AC_MSG_CHECKING(for cpdflib support) AC_ARG_WITH(cpdflib, [ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).], [ - if test $withval = no; then -AC_MSG_RESULT(no) - else -AC_MSG_RESULT(yes) -PHP_NEW_EXTENSION(cpdf, cpdf.c) + PHP_WITH_SHARED + if test $withval != no; then +PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared) +PHP_SUBST(CPDF_SHARED_LIBADD) + CPDF_JPEG_TEST CPDF_TIFF_TEST + for i in $withval /usr /usr/local; do if test -f $i/include/cpdflib.h; then CPDFLIB_INCLUDE=$i/include AC_MSG_CHECKING(for cpdflib.h) AC_MSG_RESULT([in $i/include]) -CPDF_TEMP_SUBST([ - LIBS=$LIBS -L$i/lib - AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], -[AC_MSG_ERROR([Cpdflib module requires cpdflib = 2.])]) -]) -if test $i != /usr -a $i != /usr/local; then - PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib) + +PHP_CHECK_LIBRARY(cpdf, cpdf_open, [ PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) -else - PHP_ADD_LIBRARY(cpdf) -fi + PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) + AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) +], [ +
[PHP-CVS] cvs: php4 /ext/ncurses ncurses_functions.c
sniper Sat Jun 14 09:31:52 2003 EDT
Modified files:
/php4/ext/ncurses ncurses_functions.c
Log:
Fix compile failure.
Index: php4/ext/ncurses/ncurses_functions.c
diff -u php4/ext/ncurses/ncurses_functions.c:1.40
php4/ext/ncurses/ncurses_functions.c:1.41
--- php4/ext/ncurses/ncurses_functions.c:1.40 Tue Jun 10 16:03:33 2003
+++ php4/ext/ncurses/ncurses_functions.cSat Jun 14 09:31:51 2003
@@ -2239,7 +2239,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, handle) == FAILURE)
{
return;
}
- zend_list_delete(Z_RESVAL_PP(handle));
+ zend_list_delete(Z_RESVAL_P(handle));
RETURN_TRUE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dom config.m4 /ext/domxml config.m4
helly Sat Jun 14 09:35:09 2003 EDT Modified files: /php4/ext/domxmlconfig.m4 /php4/ext/dom config.m4 Log: Improve/fix preventing both enabled Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.48 php4/ext/domxml/config.m4:1.49 --- php4/ext/domxml/config.m4:1.48 Sat Jun 14 07:27:49 2003 +++ php4/ext/domxml/config.m4 Sat Jun 14 09:35:09 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.48 2003/06/14 11:27:49 helly Exp $ +dnl $Id: config.m4,v 1.49 2003/06/14 13:35:09 helly Exp $ dnl AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[ @@ -36,7 +36,7 @@ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom, for DOM support, +PHP_ARG_WITH(dom, for old deprecated DOM support, [ --with-dom[=DIR]Old deprecated DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) Index: php4/ext/dom/config.m4 diff -u php4/ext/dom/config.m4:1.2 php4/ext/dom/config.m4:1.3 --- php4/ext/dom/config.m4:1.2 Sat Jun 14 07:27:49 2003 +++ php4/ext/dom/config.m4 Sat Jun 14 09:35:09 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.2 2003/06/14 11:27:49 helly Exp $ +dnl $Id: config.m4,v 1.3 2003/06/14 13:35:09 helly Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -19,13 +19,9 @@ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom5, for DOM support, +PHP_ARG_WITH(dom5, for new DOM support, [ --with-dom5[=DIR] Include new DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) - -if test $PHP_DOM != no -a $PHP_DOM5 != no; then -AC_MSG_ERROR([Either use deprecated dom or new dom5 extension.]) -fi if test -z $PHP_ZLIB_DIR; then PHP_ARG_WITH(zlib-dir, for the location of libz, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba config.m4
sniper Sat Jun 14 10:22:13 2003 EDT Modified files: /php4/ext/dba config.m4 Log: - Fixed some /usr/lib leaks into LIBS/LDFLAGS which later on made other configure checks fail (old libs in /usr/lib, new ones in /opt/lib :) Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.52 php4/ext/dba/config.m4:1.53 --- php4/ext/dba/config.m4:1.52 Thu May 29 10:01:21 2003 +++ php4/ext/dba/config.m4 Sat Jun 14 10:22:13 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.52 2003/05/29 14:01:21 helly Exp $ +dnl $Id: config.m4,v 1.53 2003/06/14 14:22:13 sniper Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -26,10 +26,10 @@ AC_DEFUN(PHP_DBA_STD_CHECK,[ THIS_RESULT=yes if test -z $THIS_INCLUDE; then -AC_MSG_ERROR(cannot find necessary header file(s)) +AC_MSG_ERROR([DBA: Could not find necessary header file(s).]) fi if test -z $THIS_LIBS; then -AC_MSG_ERROR(cannot find necessary library) +AC_MSG_ERROR([DBA: Could not find necessary library.]) fi ]) @@ -79,13 +79,11 @@ if test -n $THIS_INCLUDE; then unset ac_cv_lib_gdbm_gdbm_open - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ -AC_CHECK_LIB(gdbm, gdbm_open, [ - AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) - AC_DEFINE(DBA_GDBM, 1, [ ]) - THIS_LIBS=gdbm -]) - ]) + PHP_CHECK_LIBRARY(gdbm, gdbm_open, [ +AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) +AC_DEFINE(DBA_GDBM, 1, [ ]) +THIS_LIBS=gdbm + ], [], [-L$THIS_PREFIX/lib]) fi PHP_DBA_STD_ASSIGN @@ -113,14 +111,14 @@ if test -n $THIS_INCLUDE; then for LIB in ndbm db1 c; do -PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbm_open, [ -AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) -AC_DEFINE(DBA_NDBM,1, [ ]) -THIS_LIBS=$LIB -break - ]) -]) +PHP_CHECK_LIBRARY($LIB, dbm_open, [ + AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) + AC_DEFINE(DBA_NDBM, 1, [ ]) + THIS_LIBS=$LIB +], [], [-L$THIS_PREFIX/lib]) +if test -n $THIS_LIBS; then + break +fi done fi @@ -316,24 +314,22 @@ if test -n $THIS_INCLUDE; then for LIB in dbm c gdbm; do -PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbminit, [ -AC_MSG_CHECKING(for DBM using GDBM) -AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) -if test $LIB = gdbm; then - AC_DEFINE_UNQUOTED(DBM_VERSION, GDBM, [ ]) - AC_MSG_RESULT(yes) -else - AC_DEFINE_UNQUOTED(DBM_VERSION, DBM, [ ]) - AC_MSG_RESULT(no) -fi -AC_DEFINE(DBA_DBM,1,[ ]) -THIS_LIBS=$LIB - ]) - if test -n $THIS_LIBS; then -break +PHP_CHECK_LIBRARY($LIB, dbminit, [ + AC_MSG_CHECKING(for DBM using GDBM) + AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) + if test $LIB = gdbm; then +AC_DEFINE_UNQUOTED(DBM_VERSION, GDBM, [ ]) +AC_MSG_RESULT(yes) + else +AC_DEFINE_UNQUOTED(DBM_VERSION, DBM, [ ]) +AC_MSG_RESULT(no) fi -]) + AC_DEFINE(DBA_DBM, 1, [ ]) + THIS_LIBS=$LIB +], [], [-L$THIS_PREFIX/lib]) +if test -n $THIS_LIBS; then + break +fi done fi @@ -368,14 +364,14 @@ if test -n $THIS_INCLUDE; then for LIB in cdb c; do -PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, cdb_read, [ -AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, $THIS_INCLUDE, [ ]) -AC_DEFINE(DBA_CDB,1,[ ]) -THIS_LIBS=$LIB -break - ]) -]) +PHP_CHECK_LIBRARY($LIB, cdb_read, [ + AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, $THIS_INCLUDE, [ ]) + AC_DEFINE(DBA_CDB, 1, [ ]) + THIS_LIBS=$LIB +], [], [-L$THIS_PREFIX/lib]) +if test -n $THIS_LIBS; then + break +fi done 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/dba config.m4
sniper Sat Jun 14 10:33:11 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/dba config.m4 Log: MFH Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.29.2.20 php4/ext/dba/config.m4:1.29.2.21 --- php4/ext/dba/config.m4:1.29.2.20Thu May 29 10:16:25 2003 +++ php4/ext/dba/config.m4 Sat Jun 14 10:33:11 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.29.2.20 2003/05/29 14:16:25 helly Exp $ +dnl $Id: config.m4,v 1.29.2.21 2003/06/14 14:33:11 sniper Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -26,10 +26,10 @@ AC_DEFUN(PHP_DBA_STD_CHECK,[ THIS_RESULT=yes if test -z $THIS_INCLUDE; then -AC_MSG_ERROR(cannot find necessary header file(s)) +AC_MSG_ERROR([DBA: Could not find necessary header file(s).]) fi if test -z $THIS_LIBS; then -AC_MSG_ERROR(cannot find necessary library) +AC_MSG_ERROR([DBA: Could not find necessary library.]) fi ]) @@ -79,13 +79,11 @@ if test -n $THIS_INCLUDE; then unset ac_cv_lib_gdbm_gdbm_open - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ -AC_CHECK_LIB(gdbm, gdbm_open, [ - AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) - AC_DEFINE(DBA_GDBM, 1, [ ]) - THIS_LIBS=gdbm -]) - ]) + PHP_CHECK_LIBRARY(gdbm, gdbm_open, [ +AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) +AC_DEFINE(DBA_GDBM, 1, [ ]) +THIS_LIBS=gdbm + ], [], [-L$THIS_PREFIX/lib]) fi PHP_DBA_STD_ASSIGN @@ -113,14 +111,14 @@ if test -n $THIS_INCLUDE; then for LIB in ndbm db1 c; do -PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbm_open, [ -AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) -AC_DEFINE(DBA_NDBM,1, [ ]) -THIS_LIBS=$LIB -break - ]) -]) +PHP_CHECK_LIBRARY($LIB, dbm_open, [ + AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) + AC_DEFINE(DBA_NDBM, 1, [ ]) + THIS_LIBS=$LIB +], [], [-L$THIS_PREFIX/lib]) +if test -n $THIS_LIBS; then + break +fi done fi @@ -316,24 +314,22 @@ if test -n $THIS_INCLUDE; then for LIB in dbm c gdbm; do -PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbminit, [ -AC_MSG_CHECKING(for DBM using GDBM) -AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) -if test $LIB = gdbm; then - AC_DEFINE_UNQUOTED(DBM_VERSION, GDBM, [ ]) - AC_MSG_RESULT(yes) -else - AC_DEFINE_UNQUOTED(DBM_VERSION, DBM, [ ]) - AC_MSG_RESULT(no) -fi -AC_DEFINE(DBA_DBM,1,[ ]) -THIS_LIBS=$LIB - ]) - if test -n $THIS_LIBS; then -break +PHP_CHECK_LIBRARY($LIB, dbminit, [ + AC_MSG_CHECKING(for DBM using GDBM) + AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, $THIS_INCLUDE, [ ]) + if test $LIB = gdbm; then +AC_DEFINE_UNQUOTED(DBM_VERSION, GDBM, [ ]) +AC_MSG_RESULT(yes) + else +AC_DEFINE_UNQUOTED(DBM_VERSION, DBM, [ ]) +AC_MSG_RESULT(no) fi -]) + AC_DEFINE(DBA_DBM, 1, [ ]) + THIS_LIBS=$LIB +], [], [-L$THIS_PREFIX/lib]) +if test -n $THIS_LIBS; then + break +fi done fi @@ -368,14 +364,14 @@ if test -n $THIS_INCLUDE; then for LIB in cdb c; do -PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, cdb_read, [ -AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, $THIS_INCLUDE, [ ]) -AC_DEFINE(DBA_CDB,1,[ ]) -THIS_LIBS=$LIB -break - ]) -]) +PHP_CHECK_LIBRARY($LIB, cdb_read, [ + AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, $THIS_INCLUDE, [ ]) + AC_DEFINE(DBA_CDB, 1, [ ]) + THIS_LIBS=$LIB +], [], [-L$THIS_PREFIX/lib]) +if test -n $THIS_LIBS; then + break +fi done 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) /main main.c php_variables.c
iliaa Sat Jun 14 11:08:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c php_variables.c
Log:
MFH: Fixed bug #24007 (Problem with register_globals arrays)
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.39 php4/main/main.c:1.512.2.40
--- php4/main/main.c:1.512.2.39 Thu Jun 12 04:33:45 2003
+++ php4/main/main.cSat Jun 14 11:08:37 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.39 2003/06/12 08:33:45 derick Exp $ */
+/* $Id: main.c,v 1.512.2.40 2003/06/14 15:08:37 iliaa Exp $ */
/* {{{ includes
*/
@@ -1495,6 +1495,20 @@
}
}
+ if (PG(register_globals)) {
+ HashPosition pos;
+ zval **data;
+ char *string_key;
+ uint string_key_len;
+
+
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(form_variables), pos);
+ while
(zend_hash_get_current_data_ex(Z_ARRVAL_P(form_variables), (void **)data, pos) ==
SUCCESS) {
+
zend_hash_get_current_key_ex(Z_ARRVAL_P(form_variables), string_key, string_key_len,
NULL, 0, pos);
+
+ ZEND_SET_SYMBOL_WITH_LENGTH(EG(symbol_table),
string_key, string_key_len, *data, (*data)-refcount+1, 0);
+ zend_hash_move_forward_ex(Z_ARRVAL_P(form_variables),
pos);
+ }
+ }
zend_hash_update(EG(symbol_table), _REQUEST, sizeof(_REQUEST),
form_variables, sizeof(zval *), NULL);
}
Index: php4/main/php_variables.c
diff -u php4/main/php_variables.c:1.45.2.3 php4/main/php_variables.c:1.45.2.4
--- php4/main/php_variables.c:1.45.2.3 Tue Dec 31 11:26:23 2002
+++ php4/main/php_variables.c Sat Jun 14 11:08:37 2003
@@ -16,7 +16,7 @@
| Zeev Suraski [EMAIL PROTECTED]|
+--+
*/
-/* $Id: php_variables.c,v 1.45.2.3 2002/12/31 16:26:23 sebastian Exp $ */
+/* $Id: php_variables.c,v 1.45.2.4 2003/06/14 15:08:37 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -63,23 +63,15 @@
char *ip; /* index pointer */
char *index;
int var_len, index_len;
- zval *gpc_element, **gpc_element_p, **top_gpc_p=NULL;
+ zval *gpc_element, **gpc_element_p;
zend_bool is_array;
HashTable *symtable1=NULL;
- HashTable *symtable2=NULL;
assert(var != NULL);
if (track_vars_array) {
symtable1 = Z_ARRVAL_P(track_vars_array);
}
- if (PG(register_globals)) {
- if (symtable1) {
- symtable2 = EG(active_symbol_table);
- } else {
- symtable1 = EG(active_symbol_table);
- }
- }
if (!symtable1) {
/* Nothing to do */
zval_dtor(val);
@@ -164,9 +156,6 @@
efree(escaped_index);
}
}
- if (!top_gpc_p) {
- top_gpc_p = gpc_element_p;
- }
symtable1 = Z_ARRVAL_PP(gpc_element_p);
/* ip pointed to the '[' character, now obtain the key */
index = index_s;
@@ -189,18 +178,8 @@
} else {
zend_hash_update(symtable1, index, index_len+1,
gpc_element, sizeof(zval *), (void **) gpc_element_p);
}
- if (!top_gpc_p) {
- top_gpc_p = gpc_element_p;
- }
break;
}
- }
-
- if (top_gpc_p) {
- if (symtable2) {
- zend_hash_update(symtable2, var, var_len+1, top_gpc_p,
sizeof(zval *), NULL);
- (*top_gpc_p)-refcount++;
- }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xml xml.c
rrichards Sat Jun 14 11:08:49 2003 EDT
Modified files:
/php4/ext/xml xml.c
Log:
fix common libxml init and deinit routines
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.131 php4/ext/xml/xml.c:1.132
--- php4/ext/xml/xml.c:1.131Sat Jun 14 07:22:13 2003
+++ php4/ext/xml/xml.c Sat Jun 14 11:08:48 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.131 2003/06/14 11:22:13 rrichards Exp $ */
+/* $Id: xml.c,v 1.132 2003/06/14 15:08:48 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -231,7 +231,10 @@
php_xml_mem_hdlrs.free_fcn = php_xml_free_wrapper;
#ifdef LIBXML_EXPAT_COMPAT
- xmlInitThreads();
+ if (!xml_parser_inited) {
+ xmlInitThreads();
+ xml_parser_inited = 1;
+ }
#endif
return SUCCESS;
}
@@ -245,18 +248,18 @@
PHP_MSHUTDOWN_FUNCTION(xml)
{
+#ifdef LIBXML_EXPAT_COMPAT
+ if (xml_parser_inited) {
+ xmlCleanupParser();
+ xml_parser_inited = 0;
+ }
+#endif
return SUCCESS;
}
PHP_RSHUTDOWN_FUNCTION(xml)
{
-#ifdef LIBXML_EXPAT_COMPAT
- if (xml_parser_inited) {
- xmlCleanupParser();
- xml_parser_inited = 0;
- }
-#endif
return SUCCESS;
}
--
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
iliaa Sat Jun 14 11:09:26 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Bug fixing news Index: php4/NEWS diff -u php4/NEWS:1.1247.2.252 php4/NEWS:1.1247.2.253 --- php4/NEWS:1.1247.2.252 Fri Jun 13 10:56:37 2003 +++ php4/NEWS Sat Jun 14 11:09:26 2003 @@ -32,6 +32,7 @@ ([EMAIL PROTECTED], Ilia) - Fixed bug #24060 (ncurses_del_panel() causes segfault). (Georg) - Fixed bug #24054 (Integer overflow failure with GCC/x86 for *=). (Sascha) +- Fixed bug #24007 (Problem with register_globals arrays). (Ilia) - Fixed bug #23951 (constants in static initializers clobbered by inheritance). (Wez, Zend Engine) - Fixed bug #23913 (make rename() work across partitions on *nix). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dom php_dom.c xml_common.h
rrichards Sat Jun 14 11:27:15 2003 EDT
Modified files:
/php4/ext/dom php_dom.c xml_common.h
Log:
fix xml_parser_inited on win32
add common structs for better interoprability
Index: php4/ext/dom/php_dom.c
diff -u php4/ext/dom/php_dom.c:1.10 php4/ext/dom/php_dom.c:1.11
--- php4/ext/dom/php_dom.c:1.10 Thu Jun 12 16:02:05 2003
+++ php4/ext/dom/php_dom.c Sat Jun 14 11:27:15 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.10 2003/06/12 20:02:05 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.11 2003/06/14 15:27:15 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -37,7 +37,7 @@
#define PHP_XPATH 1
#define PHP_XPTR 2
-extern int xml_parser_inited;
+DOM_IMPORT int xml_parser_inited;
zend_object_handlers dom_object_handlers;
Index: php4/ext/dom/xml_common.h
diff -u php4/ext/dom/xml_common.h:1.5 php4/ext/dom/xml_common.h:1.6
--- php4/ext/dom/xml_common.h:1.5 Tue Jun 10 16:03:27 2003
+++ php4/ext/dom/xml_common.h Sat Jun 14 11:27:15 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xml_common.h,v 1.5 2003/06/10 20:03:27 imajes Exp $ */
+/* $Id: xml_common.h,v 1.6 2003/06/14 15:27:15 rrichards Exp $ */
#ifndef PHP_XML_COMMON_H
#define PHP_XML_COMMON_H
@@ -27,12 +27,23 @@
void *next;
} node_list_pointer;
+typedef struct _doc_ref_obj {
+ void *ptr;
+ int refcount;
+} doc_ref_obj;
+
typedef struct _dom_ref_obj {
void *ptr;
int refcount;
node_list_pointer *node_list;
} dom_ref_obj;
+typedef struct _node_object {
+ zend_object std;
+ xmlNodePtr node;
+ doc_ref_obj *document;
+} node_object;
+
typedef struct _dom_object {
zend_object std;
void *ptr;
@@ -50,6 +61,9 @@
#else
#define PHPAPI __declspec(dllimport)
#endif /* DOM_EXPORTS */
+#define DOM_IMPORT __declspec(dllimport)
+#else
+#define DOM_IMPORT extern
#endif /* PHP_WIN32 */
#ifdef ZTS
@@ -85,6 +99,16 @@
php_error(E_WARNING, Couldn't fetch %s, __intern-std.ce-name);\
RETURN_NULL();\
} \
+}
+
+#define DOC_GET_OBJ(__ptr, __id, __prtype, __intern) { \
+ __intern = (node_object *)zend_object_store_get_object(__id TSRMLS_CC); \
+ if (__intern-document != NULL) { \
+ if (!(__ptr = (__prtype)__intern-document-ptr)) { \
+ php_error(E_WARNING, Couldn't fetch %s,
__intern-std.ce-name);\
+ RETURN_NULL();\
+ } \
+ } \
}
#define DOM_DOMOBJ_NEW(zval, obj, ret, domobject) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xsl xsltprocessor.c
rrichards Sat Jun 14 11:28:13 2003 EDT
Modified files:
/php4/ext/xsl xsltprocessor.c
Log:
interoperability support
Index: php4/ext/xsl/xsltprocessor.c
diff -u php4/ext/xsl/xsltprocessor.c:1.4 php4/ext/xsl/xsltprocessor.c:1.5
--- php4/ext/xsl/xsltprocessor.c:1.4Tue Jun 10 16:03:40 2003
+++ php4/ext/xsl/xsltprocessor.cSat Jun 14 11:28:13 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.4 2003/06/10 20:03:40 imajes Exp $ */
+/* $Id: xsltprocessor.c,v 1.5 2003/06/14 15:28:13 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -128,14 +128,14 @@
xsltStylesheetPtr sheetp, oldsheetp;
xmlDocPtr newdocp;
xsl_object *intern;
- dom_object *docobj;
+ node_object *docobj;
DOM_GET_THIS(id);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, o, docp) == FAILURE) {
RETURN_FALSE;
}
- DOM_GET_OBJ(doc, docp, xmlDocPtr, docobj);
+ DOC_GET_OBJ(doc, docp, xmlDocPtr, docobj);
/* copy the doc, so that it's not accessable from outside
FIXME: and doubling memory consumption...
*/
@@ -176,7 +176,7 @@
int ret;
char **params = NULL;
xsl_object *intern;
- dom_object *docobj;
+ node_object *docobj;
id = getThis();
intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);
@@ -185,7 +185,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, o, docp) == FAILURE) {
RETURN_FALSE;
}
- DOM_GET_OBJ(doc, docp, xmlDocPtr, docobj);
+ DOC_GET_OBJ(doc, docp, xmlDocPtr, docobj);
if (intern-parameter) {
params = php_xsl_xslt_make_params(intern-parameter, 0 TSRMLS_CC);
@@ -228,7 +228,7 @@
int doc_txt_len;
char **params = NULL;
xsl_object *intern;
- dom_object *docobj;
+ node_object *docobj;
id = getThis();
intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);
@@ -237,7 +237,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, o, docp) == FAILURE) {
RETURN_FALSE;
}
- DOM_GET_OBJ(doc, docp, xmlDocPtr, docobj);
+ DOC_GET_OBJ(doc, docp, xmlDocPtr, docobj);
if (intern-parameter) {
params = php_xsl_xslt_make_params(intern-parameter, 0 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/interbase interbase.c php_interbase.h
daniela Sat Jun 14 12:38:11 2003 EDT
Modified files:
/php4/ext/interbase interbase.c php_interbase.h
Log:
Added IBASE_REC_VERSION/IBASE_REC_NO_VERSION transaction constants
required from bugs #8797 #23887
(added IBASE_WRITE, IBASE_WAIT, IBASE_CONCURRENCY just for clarity)
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.108 php4/ext/interbase/interbase.c:1.109
--- php4/ext/interbase/interbase.c:1.108Thu Jun 12 07:24:24 2003
+++ php4/ext/interbase/interbase.c Sat Jun 14 12:38:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.108 2003/06/12 11:24:24 andrey Exp $ */
+/* $Id: interbase.c,v 1.109 2003/06/14 16:38:10 daniela Exp $ */
/* TODO: Arrays, roles?
@@ -546,13 +546,19 @@
REGISTER_LONG_CONSTANT(IBASE_DEFAULT, PHP_IBASE_DEFAULT, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_TEXT, PHP_IBASE_TEXT, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_UNIXTIME, PHP_IBASE_UNIXTIME, CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_TIMESTAMP, PHP_IBASE_TIMESTAMP,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_DATE, PHP_IBASE_DATE, CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_TIME, PHP_IBASE_TIME, CONST_PERSISTENT);
+ /* transactions */
+ REGISTER_LONG_CONSTANT(IBASE_WRITE, PHP_IBASE_WRITE, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_READ, PHP_IBASE_READ, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_COMMITTED, PHP_IBASE_COMMITTED,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_CONSISTENCY, PHP_IBASE_CONSISTENCY,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_CONCURRENCY, PHP_IBASE_CONCURRENCY,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_REC_VERSION, PHP_IBASE_REC_VERSION,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_REC_NO_VERSION, PHP_IBASE_REC_NO_VERSION,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_NOWAIT, PHP_IBASE_NOWAIT, CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(IBASE_TIMESTAMP, PHP_IBASE_TIMESTAMP,
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(IBASE_DATE, PHP_IBASE_DATE, CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(IBASE_TIME, PHP_IBASE_TIME, CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_WAIT, PHP_IBASE_WAIT, CONST_PERSISTENT);
return SUCCESS;
}
@@ -622,7 +628,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.108 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.109 $);
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
#endif
@@ -1547,22 +1553,27 @@
if (trans_argl PHP_IBASE_READ) { /* READ ONLY TRANSACTION */
tpb[tpb_len++] = isc_tpb_read;
} else {
- tpb[tpb_len++] = isc_tpb_write;
+ tpb[tpb_len++] = isc_tpb_write; /* default access mode */
}
/* isolation level */
if (trans_argl PHP_IBASE_COMMITTED) {
tpb[tpb_len++] = isc_tpb_read_committed;
+ if (trans_argl PHP_IBASE_REC_VERSION) {
+ tpb[tpb_len++] = isc_tpb_rec_version;
+ }else{
+ tpb[tpb_len++] = isc_tpb_no_rec_version; /* default in
read_committed */
+ }
} else if (trans_argl PHP_IBASE_CONSISTENCY) {
tpb[tpb_len++] = isc_tpb_consistency;
} else {
- tpb[tpb_len++] = isc_tpb_concurrency;
+ tpb[tpb_len++] = isc_tpb_concurrency; /* default isolation
level */
}
/* lock resolution */
if (trans_argl PHP_IBASE_NOWAIT) {
tpb[tpb_len++] = isc_tpb_nowait;
} else {
- tpb[tpb_len++] = isc_tpb_wait;
+ tpb[tpb_len++] = isc_tpb_wait; /* default lock resolution */
}
}
Index: php4/ext/interbase/php_interbase.h
diff -u php4/ext/interbase/php_interbase.h:1.31 php4/ext/interbase/php_interbase.h:1.32
--- php4/ext/interbase/php_interbase.h:1.31 Tue Jun 10 16:03:30 2003
+++ php4/ext/interbase/php_interbase.h Sat Jun 14 12:38:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_interbase.h,v 1.31 2003/06/10 20:03:30 imajes Exp $ */
+/* $Id: php_interbase.h,v 1.32 2003/06/14 16:38:10 daniela Exp $ */
#ifndef PHP_INTERBASE_H
#define PHP_INTERBASE_H
@@ -159,16 +159,22 @@
/* extern ibase_module php_ibase_module; */
enum php_interbase_option {
- PHP_IBASE_DEFAULT = 0,
-
[PHP-CVS] cvs: php4 /ext/interbase/tests 005.phpt interbase.inc
daniela Sat Jun 14 12:45:38 2003 EDT
Modified files:
/php4/ext/interbase/tests interbase.inc 005.phpt
Log:
Added test for IBASE_REC_VERSION/IBASE_REC_NO_VERSION trans constants
Index: php4/ext/interbase/tests/interbase.inc
diff -u php4/ext/interbase/tests/interbase.inc:1.3
php4/ext/interbase/tests/interbase.inc:1.4
--- php4/ext/interbase/tests/interbase.inc:1.3 Wed Apr 30 06:42:24 2003
+++ php4/ext/interbase/tests/interbase.inc Sat Jun 14 12:45:38 2003
@@ -1,6 +1,6 @@
?php
-/* $Id: interbase.inc,v 1.3 2003/04/30 10:42:24 sniper Exp $ */
+/* $Id: interbase.inc,v 1.4 2003/06/14 16:45:38 daniela Exp $ */
/* used in tests */
srand((double)microtime()*100);
@@ -57,6 +57,19 @@
}
echo ---\n;
}
+
+function out_result_trap_error($result, $table_name = )
+{
+ echo --- $table_name ---\n;
+ while ($r = @ibase_fetch_assoc($result)){
+ while (list($k, $v) = each($r) ){
+ echo $r[$k]\t;
+ }
+ echo \n;
+ }
+ echo errmsg [ . ibase_errmsg() . ]\t\n;
+ echo ---\n;
+}
/* M/D/Y H:M:S */
function rand_datetime()
Index: php4/ext/interbase/tests/005.phpt
diff -u php4/ext/interbase/tests/005.phpt:1.3 php4/ext/interbase/tests/005.phpt:1.4
--- php4/ext/interbase/tests/005.phpt:1.3 Fri Apr 25 11:43:28 2003
+++ php4/ext/interbase/tests/005.phpt Sat Jun 14 12:45:38 2003
@@ -108,7 +108,8 @@
$tr_1 = ibase_trans(); /* this default transaction also */
$tr_2 = ibase_trans(IBASE_READ);
- $tr_3 = ibase_trans(IBASE_READ+IBASE_COMMITTED);
+ $tr_3 = ibase_trans(IBASE_READ+IBASE_COMMITTED+IBASE_REC_VERSION+IBASE_WAIT);
+ $tr_4 =
ibase_trans(IBASE_READ+IBASE_COMMITTED+IBASE_REC_NO_VERSION+IBASE_NOWAIT);
$res = ibase_query(select * from test5);
@@ -139,6 +140,10 @@
ibase_commit($tr_1);
+ $tr_1 = ibase_trans();
+ibase_query($tr_1, insert into test5 (i) values (5));
+
+ /* tr_2 is IBASE_READ + IBASE_CONCURRENCY + IBASE_WAIT */
$res = ibase_query($tr_2, select * from test5);
echo one row in second transaction\n;
@@ -146,6 +151,7 @@
ibase_free_result($res);
+ /* tr_3 is IBASE_COMMITTED + IBASE_REC_VERSION + IBASE_WAIT */
$res = ibase_query($tr_3, select * from test5);
echo three rows in third transaction\n;
@@ -153,6 +159,15 @@
ibase_free_result($res);
+ /* tr_4 IBASE_COMMITED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
+ $res = ibase_query($tr_4, select * from test5);
+
+echo three rows in fourth transaction with deadlock\n;
+out_result_trap_error($res,test5);
+
+ibase_free_result($res);
+
+ibase_rollback($tr_1);
ibase_close();
/*
transactions on second link
@@ -246,6 +261,13 @@
2
3
4
+---
+three rows in fourth transaction with deadlock
+--- test5 ---
+2
+3
+4
+errmsg [lock conflict on no wait transaction deadlock ]
---
three rows
--- test5 ---
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/db CREDITS db.c package.xml php_db.h
helly Sat Jun 14 12:54:18 2003 EDT
Added files:
/php4/ext/dbpackage.xml
Modified files:
/php4/ext/dbCREDITS db.c php_db.h
Log:
Update before moving to PECL
Index: php4/ext/db/CREDITS
diff -u php4/ext/db/CREDITS:1.1 php4/ext/db/CREDITS:1.2
--- php4/ext/db/CREDITS:1.1 Mon Nov 20 05:31:16 2000
+++ php4/ext/db/CREDITS Sat Jun 14 12:54:18 2003
@@ -1,2 +1,2 @@
DBM
-Rasmus Lerdorf, Jim Winstead
+Rasmus Lerdorf, Jim Winstead, Marcus Boerger
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.87 php4/ext/db/db.c:1.88
--- php4/ext/db/db.c:1.87 Tue Jun 10 16:03:26 2003
+++ php4/ext/db/db.cSat Jun 14 12:54:18 2003
@@ -4,20 +4,21 @@
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
- | This source file is subject to version 3.0 of the PHP license, |
+ | This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
+ | available at through the world-wide-web at |
+ | http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
| Authors: Rasmus Lerdorf [EMAIL PROTECTED] |
| Jim Winstead [EMAIL PROTECTED] |
+ | Marcus Boerger [EMAIL PROTECTED] |
+--+
*/
-/* $Id: db.c,v 1.87 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: db.c,v 1.88 2003/06/14 16:54:18 helly Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -185,8 +186,6 @@
/* {{{ proto array db_id_list(void)
Return an associative array id-filename */
-#if HELLY_0
-/* New function not needed yet */
PHP_FUNCTION(db_id_list)
{
ulong numitems, i;
@@ -212,7 +211,6 @@
}
}
/* }}} */
-#endif
/* {{{ php_get_info_db
*/
@@ -1096,7 +1094,7 @@
}
/* }}} */
-/* {{{ latfile_nextkey
+/* {{{ flatfile_nextkey
*/
datum flatfile_nextkey(FILE *dbf) {
datum buf;
@@ -1170,9 +1168,7 @@
PHP_FE(dbmdelete,
NULL)
PHP_FE(dbmfirstkey,
NULL)
PHP_FE(dbmnextkey,
NULL)
-#if HELLY_0
PHP_FE(db_id_list, NULL)
-#endif
{NULL, NULL, NULL}
};
/* }}} */
Index: php4/ext/db/php_db.h
diff -u php4/ext/db/php_db.h:1.20 php4/ext/db/php_db.h:1.21
--- php4/ext/db/php_db.h:1.20 Tue Jun 10 16:03:26 2003
+++ php4/ext/db/php_db.hSat Jun 14 12:54:18 2003
@@ -14,10 +14,11 @@
+--+
| Authors: Rasmus Lerdorf [EMAIL PROTECTED] |
| Jim Winstead [EMAIL PROTECTED] |
+ | Marcus Boerger [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_db.h,v 1.20 2003/06/10 20:03:26 imajes Exp $ */
+/* $Id: php_db.h,v 1.21 2003/06/14 16:54:18 helly Exp $ */
#ifndef PHP_DB_H
@@ -76,5 +77,6 @@
PHP_FUNCTION(dbmdelete);
PHP_FUNCTION(dbmfirstkey);
PHP_FUNCTION(dbmnextkey);
+PHP_FUNCTION(db_id_list);
#endif /* PHP_DB_H */
Index: php4/ext/db/package.xml
+++ php4/ext/db/package.xml
?xml version=1.0 encoding=ISO-8859-1 ?
!DOCTYPE package SYSTEM ../../../php4/pear/package.dtd
package
nameDBM/name
summaryDBM database bindings/summary
maintainers
maintainer
userrasmus/user
nameRasmus Lerdorf/name
email[EMAIL PROTECTED]/email
rolelead/role
/maintainer
maintainer
userjimw/user
nameJim Winstead/name
email[EMAIL PROTECTED]/email
rolelead/role
/maintainer
maintainer
userhelly/user
nameMarcus Bouml;rger/name
email[EMAIL PROTECTED]/email
roledeveloper/role
/maintainer
/maintainers
description
This deprecated package is replaced by the standard extenstion dba.
/description
licensePHP/license
release
statedeprecated/state
version1.0/version
date2003-06-14/date
notes
/notes
filelist
file role=src
[PHP-CVS] cvs: php4 /ext/standard file.c
helly Sat Jun 14 13:08:49 2003 EDT
Modified files:
/php4/ext/standard file.c
Log:
Fix ZTS mode
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.347 php4/ext/standard/file.c:1.348
--- php4/ext/standard/file.c:1.347 Fri Jun 13 17:33:59 2003
+++ php4/ext/standard/file.cSat Jun 14 13:08:49 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.347 2003/06/13 21:33:59 pollita Exp $ */
+/* $Id: file.c,v 1.348 2003/06/14 17:08:49 helly Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -131,6 +131,7 @@
{
php_stream_context *context = (php_stream_context*)rsrc-ptr;
zval_dtor(context-options);
+ context-options = NULL;
php_stream_context_free(context);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/db db.c
helly Sat Jun 14 13:14:43 2003 EDT Modified files: /php4/ext/dbdb.c Log: Correct license again Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.88 php4/ext/db/db.c:1.89 --- php4/ext/db/db.c:1.88 Sat Jun 14 12:54:18 2003 +++ php4/ext/db/db.cSat Jun 14 13:14:42 2003 @@ -4,10 +4,10 @@ +--+ | Copyright (c) 1997-2003 The PHP Group| +--+ - | This source file is subject to version 2.02 of the PHP license, | + | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is| - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_0.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | [EMAIL PROTECTED] so we can mail you a copy immediately. | @@ -18,7 +18,7 @@ +--+ */ -/* $Id: db.c,v 1.88 2003/06/14 16:54:18 helly Exp $ */ +/* $Id: db.c,v 1.89 2003/06/14 17:14:42 helly Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_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) /ext/interbase interbase.c php_interbase.h /ext/interbase/tests 005.phpt interbase.inc
daniela Sat Jun 14 13:46:33 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/interbase interbase.c php_interbase.h
/php4/ext/interbase/tests interbase.inc 005.phpt
Log:
MFH: Added IBASE_REC_VERSION/IBASE_REC_NO_VERSION transaction constants
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.91.2.8 php4/ext/interbase/interbase.c:1.91.2.9
--- php4/ext/interbase/interbase.c:1.91.2.8 Thu Jun 12 07:34:31 2003
+++ php4/ext/interbase/interbase.c Sat Jun 14 13:46:33 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.91.2.8 2003/06/12 11:34:31 andrey Exp $ */
+/* $Id: interbase.c,v 1.91.2.9 2003/06/14 17:46:33 daniela Exp $ */
/* TODO: Arrays, roles?
@@ -550,13 +550,19 @@
REGISTER_LONG_CONSTANT(IBASE_DEFAULT, PHP_IBASE_DEFAULT, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_TEXT, PHP_IBASE_TEXT, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_UNIXTIME, PHP_IBASE_UNIXTIME, CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_TIMESTAMP, PHP_IBASE_TIMESTAMP,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_DATE, PHP_IBASE_DATE, CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_TIME, PHP_IBASE_TIME, CONST_PERSISTENT);
+ /* transactions */
+ REGISTER_LONG_CONSTANT(IBASE_WRITE, PHP_IBASE_WRITE, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_READ, PHP_IBASE_READ, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_COMMITTED, PHP_IBASE_COMMITTED,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_CONSISTENCY, PHP_IBASE_CONSISTENCY,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_CONCURRENCY, PHP_IBASE_CONCURRENCY,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_REC_VERSION, PHP_IBASE_REC_VERSION,
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_REC_NO_VERSION, PHP_IBASE_REC_NO_VERSION,
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IBASE_NOWAIT, PHP_IBASE_NOWAIT, CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(IBASE_TIMESTAMP, PHP_IBASE_TIMESTAMP,
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(IBASE_DATE, PHP_IBASE_DATE, CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(IBASE_TIME, PHP_IBASE_TIME, CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IBASE_WAIT, PHP_IBASE_WAIT, CONST_PERSISTENT);
return SUCCESS;
}
@@ -622,7 +628,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.91.2.8 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.91.2.9 $);
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
#endif
@@ -1541,27 +1547,34 @@
ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, link_id,
InterBase link, le_link, le_plink);
}
- if (trans_argl ) {
+ if (trans_argl) {
tpb[tpb_len++] = isc_tpb_version3;
tpbp = tpb;
/* access mode */
- if (trans_argl PHP_IBASE_READ) /* READ ONLY TRANSACTION */
+ if (trans_argl PHP_IBASE_READ) { /* READ ONLY TRANSACTION */
tpb[tpb_len++] = isc_tpb_read;
- else
- tpb[tpb_len++] = isc_tpb_write;
+ } else {
+ tpb[tpb_len++] = isc_tpb_write; /* default access mode */
+ }
/* isolation level */
if (trans_argl PHP_IBASE_COMMITTED) {
tpb[tpb_len++] = isc_tpb_read_committed;
- } else if (trans_argl PHP_IBASE_CONSISTENCY)
+ if (trans_argl PHP_IBASE_REC_VERSION) {
+ tpb[tpb_len++] = isc_tpb_rec_version;
+ }else{
+ tpb[tpb_len++] = isc_tpb_no_rec_version; /* default in
read_committed */
+ }
+ } else if (trans_argl PHP_IBASE_CONSISTENCY) {
tpb[tpb_len++] = isc_tpb_consistency;
- else
- tpb[tpb_len++] = isc_tpb_concurrency;
+ } else {
+ tpb[tpb_len++] = isc_tpb_concurrency; /* default isolation
level */
+ }
/* lock resolution */
- if (trans_argl PHP_IBASE_NOWAIT)
+ if (trans_argl PHP_IBASE_NOWAIT) {
tpb[tpb_len++] = isc_tpb_nowait;
- else
- tpb[tpb_len++] = isc_tpb_wait;
-
+ } else {
+ tpb[tpb_len++] = isc_tpb_wait; /* default lock resolution */
+ }
}
/* find empty transaction slot */
Index: php4/ext/interbase/php_interbase.h
diff -u php4/ext/interbase/php_interbase.h:1.28.2.2
[PHP-CVS] cvs: php4 /ext/xml xml.c
rrichards Sat Jun 14 14:14:06 2003 EDT
Modified files:
/php4/ext/xml xml.c
Log:
use xmlInitParser instead of xmlInitThreads
reentrant safe as well
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.132 php4/ext/xml/xml.c:1.133
--- php4/ext/xml/xml.c:1.132Sat Jun 14 11:08:48 2003
+++ php4/ext/xml/xml.c Sat Jun 14 14:14:05 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.132 2003/06/14 15:08:48 rrichards Exp $ */
+/* $Id: xml.c,v 1.133 2003/06/14 18:14:05 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -38,8 +38,6 @@
#include php_xml.h
# include ext/standard/head.h
-PHP_XML_API int xml_parser_inited = 0;
-
/* Short-term TODO list:
* - Implement XML_ExternalEntityParserCreate()
* - XML_SetCommentHandler
@@ -231,10 +229,7 @@
php_xml_mem_hdlrs.free_fcn = php_xml_free_wrapper;
#ifdef LIBXML_EXPAT_COMPAT
- if (!xml_parser_inited) {
- xmlInitThreads();
- xml_parser_inited = 1;
- }
+ xmlInitParser();
#endif
return SUCCESS;
}
@@ -249,10 +244,7 @@
PHP_MSHUTDOWN_FUNCTION(xml)
{
#ifdef LIBXML_EXPAT_COMPAT
- if (xml_parser_inited) {
- xmlCleanupParser();
- xml_parser_inited = 0;
- }
+ xmlCleanupParser();
#endif
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dom php_dom.c xml_common.h
rrichards Sat Jun 14 14:14:59 2003 EDT
Modified files:
/php4/ext/dom php_dom.c xml_common.h
Log:
use xmlInitParser instead of xmlInitThreads
reentrant safe as well no need for xml_parser_inited
Index: php4/ext/dom/php_dom.c
diff -u php4/ext/dom/php_dom.c:1.11 php4/ext/dom/php_dom.c:1.12
--- php4/ext/dom/php_dom.c:1.11 Sat Jun 14 11:27:15 2003
+++ php4/ext/dom/php_dom.c Sat Jun 14 14:14:59 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.11 2003/06/14 15:27:15 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.12 2003/06/14 18:14:59 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -37,8 +37,6 @@
#define PHP_XPATH 1
#define PHP_XPTR 2
-DOM_IMPORT int xml_parser_inited;
-
zend_object_handlers dom_object_handlers;
static HashTable classes;
@@ -580,10 +578,7 @@
REGISTER_LONG_CONSTANT(XML_ATTRIBUTE_ENUMERATION,
XML_ATTRIBUTE_ENUMERATION, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(XML_ATTRIBUTE_NOTATION,
XML_ATTRIBUTE_NOTATION, CONST_CS | CONST_PERSISTENT);
- if (!xml_parser_inited) {
- xmlInitThreads();
- xml_parser_inited = 1;
- }
+ xmlInitParser();
return SUCCESS;
}
@@ -611,10 +606,7 @@
PHP_MSHUTDOWN_FUNCTION(dom)
{
- if (xml_parser_inited) {
- xmlCleanupParser();
- xml_parser_inited = 0;
- }
+ xmlCleanupParser();
zend_hash_destroy(dom_domstringlist_prop_handlers);
zend_hash_destroy(dom_namelist_prop_handlers);
Index: php4/ext/dom/xml_common.h
diff -u php4/ext/dom/xml_common.h:1.6 php4/ext/dom/xml_common.h:1.7
--- php4/ext/dom/xml_common.h:1.6 Sat Jun 14 11:27:15 2003
+++ php4/ext/dom/xml_common.h Sat Jun 14 14:14:59 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xml_common.h,v 1.6 2003/06/14 15:27:15 rrichards Exp $ */
+/* $Id: xml_common.h,v 1.7 2003/06/14 18:14:59 rrichards Exp $ */
#ifndef PHP_XML_COMMON_H
#define PHP_XML_COMMON_H
@@ -61,9 +61,6 @@
#else
#define PHPAPI __declspec(dllimport)
#endif /* DOM_EXPORTS */
-#define DOM_IMPORT __declspec(dllimport)
-#else
-#define DOM_IMPORT extern
#endif /* PHP_WIN32 */
#ifdef ZTS
--
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/mnogosearch php_mnogo.c php_mnogo.h
gluke Sat Jun 14 14:45:23 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mnogosearch php_mnogo.c php_mnogo.h
Log:
@- Mnogosearch extension updated. Now can compile with mnogosearch-3.2.11+
- Mnogosearch extension updated. Now can compile with mnogosearch-3.2.11+
Index: php4/ext/mnogosearch/php_mnogo.c
diff -u php4/ext/mnogosearch/php_mnogo.c:1.66.2.1
php4/ext/mnogosearch/php_mnogo.c:1.66.2.2
--- php4/ext/mnogosearch/php_mnogo.c:1.66.2.1 Tue Dec 31 11:34:55 2002
+++ php4/ext/mnogosearch/php_mnogo.cSat Jun 14 14:45:23 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php4/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.66.2.1 2002/12/31 16:34:55 sebastian Exp $ */
+/* $Id: php_mnogo.c,v 1.66.2.2 2003/06/14 18:45:23 gluke Exp $ */
/*
+--+
@@ -163,6 +163,12 @@
#if UDM_VERSION_ID = 30204
PHP_FE(udm_parse_query_string, NULL)
PHP_FE(udm_make_excerpt,NULL)
+ PHP_FE(udm_set_agent_param_ex, NULL)
+ PHP_FE(udm_get_res_field_ex,NULL)
+#endif
+#if UDM_VERSION_ID = 30211
+ PHP_FE(udm_hash32, NULL)
+ PHP_FE(udm_alloc_agent_array, NULL)
#endif
#endif
@@ -456,7 +462,7 @@
UdmVarListReplaceStr(Env-Vars,SyslogFacility,local7);
UdmSetLogLevel(Env,0);
UdmOpenLog(mnoGoSearch-php,Env,0);
-
+#if UDM_VERSION_ID = 30210
if(!memcmp(dbaddr,searchd:,8)){
UDM_URL Url;
UdmURLParse(Url,dbaddr);
@@ -464,13 +470,18 @@
}
UdmVarListReplaceStr(Env-Vars,DBAddr,dbaddr);
+
if(UDM_OK!=UdmDBSetAddr(Env-db,dbaddr,UDM_OPEN_MODE_READ)){
sprintf(Env-errstr,Invalid DBAddr: '%s',dbaddr);
+#if UDM_VERSION_ID = 30207
Env-errcode=1;
- php_error(E_WARNING,%s(): Invalid DBAddr,
get_active_function_name(TSRMLS_C));
+#endif
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING,Invalid DBAddr);
RETURN_FALSE;
}
-
+#else
+ UdmDBListAdd(Env-dbl,dbaddr, UDM_OPEN_MODE_WRITE);
+#endif
Agent=UdmAgentInit(NULL,Env,0);
#elif UDM_VERSION_ID = 30200
Env=UdmAllocEnv();
@@ -508,7 +519,7 @@
UdmVarListReplaceStr(Env-Vars,SyslogFacility,local7);
UdmSetLogLevel(Env,0);
UdmOpenLog(mnoGoSearch-php,Env,0);
-
+#if UDM_VERSION_ID = 30210
if(!memcmp(dbaddr,searchd:,8)){
UDM_URL Url;
UdmURLParse(Url,dbaddr);
@@ -517,10 +528,15 @@
UdmVarListReplaceStr(Env-Vars,DBAddr,dbaddr);
if(UDM_OK!=UdmDBSetAddr(Env-db,dbaddr,UDM_OPEN_MODE_READ)){
sprintf(Env-errstr,Invalid DBAddr: '%s',dbaddr);
+#if UDM_VERSION_ID = 30207
Env-errcode=1;
- php_error(E_WARNING,%s(): Invalid DBAddr,
get_active_function_name(TSRMLS_C));
+#endif
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING,Invalid DBAddr);
RETURN_FALSE;
}
+#else
+ UdmDBListAdd(Env-dbl,dbaddr, UDM_OPEN_MODE_WRITE);
+#endif
Agent=UdmAgentInit(NULL,Env,0);
#elif UDM_VERSION_ID = 30200
Env=UdmAllocEnv();
@@ -620,7 +636,7 @@
case UDM_MODE_PHRASE:
#if UDM_VERSION_ID = 30200
- php_error(E_WARNING,%s(): Unknown
search mode, get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING,Unknown search mode);
RETURN_FALSE;
#else
Agent-search_mode=UDM_MODE_PHRASE;
@@ -633,7 +649,7 @@
#else
Agent-search_mode=UDM_MODE_ALL;
#endif
- php_error(E_WARNING,%s(): Unknown
search mode, get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING,Unknown
[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba dba.c
edink Sat Jun 14 14:51:17 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba dba.c
Log:
Fixed win32 build
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.61.2.18 php4/ext/dba/dba.c:1.61.2.19
--- php4/ext/dba/dba.c:1.61.2.18Fri Jun 13 10:53:13 2003
+++ php4/ext/dba/dba.c Sat Jun 14 14:51:17 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.61.2.18 2003/06/13 14:53:13 andrey Exp $ */
+/* $Id: dba.c,v 1.61.2.19 2003/06/14 18:51:17 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -369,7 +369,7 @@
/* {{{ PHP_INI
*/
-ZEND_API ZEND_INI_MH(OnUpdateDefaultHandler)
+ZEND_INI_MH(OnUpdateDefaultHandler)
{
dba_handler *hptr;
--
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/dba dba.c
helly Sat Jun 14 15:27:01 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba dba.c
Log:
Remove that old thing
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.61.2.19 php4/ext/dba/dba.c:1.61.2.20
--- php4/ext/dba/dba.c:1.61.2.19Sat Jun 14 14:51:17 2003
+++ php4/ext/dba/dba.c Sat Jun 14 15:27:01 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.61.2.19 2003/06/14 18:51:17 edink Exp $ */
+/* $Id: dba.c,v 1.61.2.20 2003/06/14 19:27:01 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -54,8 +54,6 @@
function_entry dba_functions[] = {
PHP_FE(dba_open, NULL)
PHP_FE(dba_popen, NULL)
- /* Disabled until 4.3.1, when persistent STDIO streams are implemented. */
- /* PHP_FE(dba_popen, NULL) */
PHP_FE(dba_close, NULL)
PHP_FE(dba_delete, NULL)
PHP_FE(dba_exists, NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard file.c /main/streams streams.c
helly Sat Jun 14 15:30:42 2003 EDT
Modified files:
/php4/ext/standard file.c
/php4/main/streams streams.c
Log:
Fix ZTS mode (hopefully all is working fine now again)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.348 php4/ext/standard/file.c:1.349
--- php4/ext/standard/file.c:1.348 Sat Jun 14 13:08:49 2003
+++ php4/ext/standard/file.cSat Jun 14 15:30:42 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.348 2003/06/14 17:08:49 helly Exp $ */
+/* $Id: file.c,v 1.349 2003/06/14 19:30:42 helly Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -130,8 +130,10 @@
static ZEND_RSRC_DTOR_FUNC(file_context_dtor)
{
php_stream_context *context = (php_stream_context*)rsrc-ptr;
- zval_dtor(context-options);
- context-options = NULL;
+ if (context-options) {
+ zval_ptr_dtor(context-options);
+ context-options = NULL;
+ }
php_stream_context_free(context);
}
Index: php4/main/streams/streams.c
diff -u php4/main/streams/streams.c:1.25 php4/main/streams/streams.c:1.26
--- php4/main/streams/streams.c:1.25Fri Jun 13 17:33:59 2003
+++ php4/main/streams/streams.c Sat Jun 14 15:30:42 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.25 2003/06/13 21:33:59 pollita Exp $ */
+/* $Id: streams.c,v 1.26 2003/06/14 19:30:42 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -413,7 +413,7 @@
size_t justread = 0;
int flags;
php_stream_bucket *bucket;
- php_stream_filter_status_t status;
+ php_stream_filter_status_t status = PSFS_ERR_FATAL;
php_stream_filter *filter;
/* read a chunk into a bucket */
@@ -893,7 +893,7 @@
php_stream_bucket *bucket;
php_stream_bucket_brigade brig_in = { NULL, NULL }, brig_out = { NULL, NULL };
php_stream_bucket_brigade *brig_inp = brig_in, *brig_outp = brig_out,
*brig_swap;
- php_stream_filter_status_t status;
+ php_stream_filter_status_t status = PSFS_ERR_FATAL;
php_stream_filter *filter;
if (buf) {
@@ -1618,7 +1618,10 @@
PHPAPI void php_stream_context_free(php_stream_context *context)
{
- zval_ptr_dtor(context-options);
+ if (context-options) {
+ zval_ptr_dtor(context-options);
+ context-options = NULL;
+ }
efree(context);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/domxml domxml.dsp
edink Sat Jun 14 21:31:43 2003 EDT Modified files: /php4/ext/domxmldomxml.dsp Log: Switch to dynamic linking of php_domxml.dll due to the libxml2 dependency already being present for the core php4ts.dll. Index: php4/ext/domxml/domxml.dsp diff -u php4/ext/domxml/domxml.dsp:1.9 php4/ext/domxml/domxml.dsp:1.10 --- php4/ext/domxml/domxml.dsp:1.9 Fri Dec 20 13:40:31 2002 +++ php4/ext/domxml/domxml.dsp Sat Jun 14 21:31:43 2003 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_THREAD_ENABLED=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib php4ts.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_domxml.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 wsock32.lib php4ts.lib libxml2.lib libxslt.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_domxml.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == domxml - Win32 Debug_TS @@ -72,7 +72,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I mssql-70 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_THREAD_ENABLED=1 /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -82,7 +82,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts_debug.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:..\..\Debug_TS/php_domxml.dll /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 php4ts_debug.lib libxml2.lib libxslt.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:..\..\Debug_TS/php_domxml.dll /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
