[PHP-CVS] cvs: php-src /ext/dom php_dom.h
rrichards Thu Jun 26 06:40:26 2003 EDT Modified files: /php-src/ext/domphp_dom.h Log: fix import/export for win32 when enabled by default Index: php-src/ext/dom/php_dom.h diff -u php-src/ext/dom/php_dom.h:1.7 php-src/ext/dom/php_dom.h:1.8 --- php-src/ext/dom/php_dom.h:1.7 Sun Jun 22 08:50:28 2003 +++ php-src/ext/dom/php_dom.h Thu Jun 26 06:40:26 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_dom.h,v 1.7 2003/06/22 12:50:28 helly Exp $ */ +/* $Id: php_dom.h,v 1.8 2003/06/26 10:40:26 rrichards Exp $ */ #ifndef PHP_DOM_H #define PHP_DOM_H @@ -48,6 +48,12 @@ #include libxml/xpointer.h #endif +#ifdef PHP_WIN32 +#ifndef DOM_EXPORTS +#define DOM_EXPORTS +#endif +#endif + #include xml_common.h /* DOM API_VERSION, please bump it up, if you change anything in the API @@ -102,4 +108,4 @@ PHP_MSHUTDOWN_FUNCTION(dom); PHP_MINFO_FUNCTION(dom); -#endif /* _PHP_DIR_H */ +#endif /* PHP_DOM_H */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsl.dsp
rrichards Thu Jun 26 06:51:37 2003 EDT Modified files: /php-src/ext/xslxsl.dsp Log: fix linking as dom symbols are now built in Index: php-src/ext/xsl/xsl.dsp diff -u php-src/ext/xsl/xsl.dsp:1.4 php-src/ext/xsl/xsl.dsp:1.5 --- php-src/ext/xsl/xsl.dsp:1.4 Sun Jun 15 15:54:38 2003 +++ php-src/ext/xsl/xsl.dsp Thu Jun 26 06:51:37 2003 @@ -53,7 +53,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 /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib php4ts.lib libxml2.lib libxslt.lib iconv.lib resolv.lib php_dom.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_xsl.dll /implib:.Release_TS/php_xsl.lib /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release +# 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_xsl.dll /implib:.Release_TS/php_xsl.lib /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == xsl - Win32 Debug_TS @@ -80,7 +80,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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 php4ts_debug.lib php_dom.lib libxml2.lib libxslt.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_xsl.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 /nologo /dll /debug /machine:I386 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_xsl.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
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevThu Jun 26 10:19:42 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: - Add libxml directory - Add zlib to configurations where it was missing - Remove libmysql linkage Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.116 php-src/win32/php4dllts.dsp:1.117 --- php-src/win32/php4dllts.dsp:1.116 Wed Jun 25 17:37:50 2003 +++ php-src/win32/php4dllts.dsp Thu Jun 26 10:19:42 2003 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D PHP4DLLTS_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\zlib /I .. /I ..\main /I ..\regex /I ..\..\bindlib_w32 /I ..\Zend /I ..\TSRM /D _DEBUG /D ZEND_DEBUG=1 /D _WINDOWS /D _USRDLL /D PHP4DLLTS_EXPORTS /D PHP_EXPORTS /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D MSVC5 /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I .. /I ..\main /I ..\regex /I ..\..\bindlib_w32 /I ..\..\zlib /I ..\Zend /I ..\TSRM /I ..\..\libxml\include /D _DEBUG /D ZEND_DEBUG=1 /D _WINDOWS /D _USRDLL /D PHP4DLLTS_EXPORTS /D PHP_EXPORTS /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D MSVC5 /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d _DEBUG @@ -55,7 +55,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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:libcmt /out:..\Debug_TS\php4ts_debug.dll /pdbtype:sept /libpath:..\TSRM\Debug_TS /libpath:..\Zend\Debug_TS /libpath:..\..\bindlib_w32\Debug /libpath:Debug_TS /libpath:..\..\zlib\Debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:libcmt /out:..\Debug_TS\php4ts_debug.dll /pdbtype:sept /libpath:..\TSRM\Debug_TS /libpath:..\Zend\Debug_TS /libpath:..\..\bindlib_w32\Debug /libpath:Debug_TS /libpath:..\..\zlib\Debug !ELSEIF $(CFG) == php4dllts - Win32 Release_TS @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D PHP4DLLTS_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I .. /I ..\main /I ..\regex /I ..\..\bindlib_w32 /I ..\..\zlib /I ..\Zend /I ..\TSRM /D NDEBUG /D ZEND_DEBUG=0 /D _WINDOWS /D _USRDLL /D PHP4DLLTS_EXPORTS /D PHP_EXPORTS /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D MSVC5 /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I .. /I ..\main /I ..\regex /I ..\..\bindlib_w32 /I ..\..\zlib /I ..\Zend /I ..\TSRM /I ..\..\libxml\include /D NDEBUG /D ZEND_DEBUG=0 /D _WINDOWS /D _USRDLL /D PHP4DLLTS_EXPORTS /D PHP_EXPORTS /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D MSVC5 /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d NDEBUG @@ -81,7 +81,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 /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libcmt /out:..\Release_TS\php4ts.dll /libpath:..\TSRM\Release_TS /libpath:..\Zend\Release_TS /libpath:..\..\bindlib_w32\Release /libpath:Release_TS /libpath:..\..\zlib\Release +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libcmt /out:..\Release_TS\php4ts.dll /libpath:..\TSRM\Release_TS /libpath:..\Zend\Release_TS /libpath:Release_TS
[PHP-CVS] cvs: php-src /win32 php_modules.dsw
sebastian Thu Jun 26 10:57:48 2003 EDT
Modified files:
/php-src/win32 php_modules.dsw
Log:
Sync.
Index: php-src/win32/php_modules.dsw
diff -u php-src/win32/php_modules.dsw:1.56 php-src/win32/php_modules.dsw:1.57
--- php-src/win32/php_modules.dsw:1.56 Wed Mar 26 01:31:26 2003
+++ php-src/win32/php_modules.dsw Thu Jun 26 10:57:48 2003
@@ -111,18 +111,6 @@
###
-Project: domxml=..\ext\domxml\domxml.dsp - Package Owner=4
-
-Package=5
-{{{
-}}}
-
-Package=4
-{{{
-}}}
-
-###
-
Project: exif=..\ext\exif\exif.dsp - Package Owner=4
Package=5
@@ -195,18 +183,6 @@
###
-Project: hyperwave=..\ext\hyperwave\hyperwave.dsp - Package Owner=4
-
-Package=5
-{{{
-}}}
-
-Package=4
-{{{
-}}}
-
-###
-
Project: iconv=..\ext\iconv\iconv.dsp - Package Owner=4
Package=5
@@ -363,6 +339,18 @@
###
+Project: mysql=..\ext\mysql\mysql.dsp - Package Owner=4
+
+Package=5
+{{{
+}}}
+
+Package=4
+{{{
+}}}
+
+###
+
Project: notes=..\ext\notes\notes.dsp - Package Owner=4
Package=5
@@ -519,31 +507,7 @@
###
-Project: xslt=..\ext\xslt\xslt.dsp - Package Owner=4
-
-Package=5
-{{{
-}}}
-
-Package=4
-{{{
-}}}
-
-###
-
Project: yaz=..\ext\yaz\yaz.dsp - Package Owner=4
-
-Package=5
-{{{
-}}}
-
-Package=4
-{{{
-}}}
-
-###
-
-Project: zip=..\ext\zip\zip.dsp - Package Owner=4
Package=5
{{{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main config.w32.h internal_functions_win32.c
sebastian Thu Jun 26 11:15:02 2003 EDT
Modified files:
/php-src/main config.w32.h internal_functions_win32.c
Log:
Sync.
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.72 php-src/main/config.w32.h:1.73
--- php-src/main/config.w32.h:1.72 Wed Jun 25 17:37:50 2003
+++ php-src/main/config.w32.h Thu Jun 26 11:15:02 2003
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.72 2003/06/25 21:37:50 sebastian Exp $
+ $Id: config.w32.h,v 1.73 2003/06/26 15:15:02 sebastian Exp $
*/
/* Default PHP / PEAR directories */
@@ -46,9 +46,6 @@
/* #define HAVE_MBSTR_KR 0 */
/* #define HAVE_MBSTR_RU 0 */
/* #define HAVE_MBSTR_TW 0 */
-
-/* Enable / Disable MySQL extension (default: disabled) */
-#define HAVE_MYSQL 0
/* Enable / Disable ODBC extension (default: enabled) */
#define HAVE_UODBC 1
Index: php-src/main/internal_functions_win32.c
diff -u php-src/main/internal_functions_win32.c:1.76
php-src/main/internal_functions_win32.c:1.77
--- php-src/main/internal_functions_win32.c:1.76Wed Jun 25 17:37:50 2003
+++ php-src/main/internal_functions_win32.c Thu Jun 26 11:15:02 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: internal_functions_win32.c,v 1.76 2003/06/25 21:37:50 sebastian Exp $ */
+/* $Id: internal_functions_win32.c,v 1.77 2003/06/26 15:15:02 sebastian Exp $ */
/* {{{ includes
*/
@@ -71,9 +71,6 @@
#if HAVE_SESSION
#include ext/session/php_session.h
#endif
-#if HAVE_MYSQL
-#include ext/mysql/php_mysql.h
-#endif
#if HAVE_MBSTRING
#include ext/mbstring/mbstring.h
#endif
@@ -118,9 +115,6 @@
#endif
#if HAVE_MBSTRING
,phpext_mbstring_ptr
-#endif
-#if HAVE_MYSQL
- ,phpext_mysql_ptr
#endif
#if HAVE_UODBC
,phpext_odbc_ptr
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php4dll.dsp
sebastian Thu Jun 26 11:16:57 2003 EDT Modified files: /php-src/win32 php4dll.dsp Log: Remove MySQL leftovers. Index: php-src/win32/php4dll.dsp diff -u php-src/win32/php4dll.dsp:1.47 php-src/win32/php4dll.dsp:1.48 --- php-src/win32/php4dll.dsp:1.47 Mon Jun 23 00:27:10 2003 +++ php-src/win32/php4dll.dsp Thu Jun 26 11:16:56 2003 @@ -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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:libcmt /nodefaultlib:libc /nodefaultlib:libcmtd /out:c:\php-fcgi\php4nts_debug.dll /pdbtype:sept /libpath:..\TSRM\Debug /libpath:..\Zend\Debug /libpath:..\..\bindlib_w32\Debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:libcmt /nodefaultlib:libc /nodefaultlib:libcmtd /out:c:\php-fcgi\php4nts_debug.dll /pdbtype:sept /libpath:..\TSRM\Debug /libpath:..\Zend\Debug /libpath:..\..\bindlib_w32\Debug !ELSEIF $(CFG) == php4dll - Win32 Release @@ -80,7 +80,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 /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib tsrm.lib /nologo /dll /machine:I386 /nodefaultlib:libc.lib /out:..\Release\php4nts.dll /libpath:..\Zend\Release /libpath:..\TSRM\Release_TS /libpath:..\..\bindlib_w32\Release +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib tsrm.lib /nologo /dll /machine:I386 /nodefaultlib:libc.lib /out:..\Release\php4nts.dll /libpath:..\Zend\Release /libpath:..\TSRM\Release_TS /libpath:..\..\bindlib_w32\Release !ELSEIF $(CFG) == php4dll - Win32 Release_inline @@ -107,7 +107,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:libc.lib /out:Release/php4nts.dll /libpath:TSRM\Release /libpath:Zend\Release /libpath:..\bindlib_w32\Release -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib tsrm.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:libc.lib /out:..\Release\php4nts.dll /libpath:..\Zend\Release_inline /libpath:..\TSRM\Release_TS_inline /libpath:..\..\bindlib_w32\Release +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib tsrm.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:libc.lib /out:..\Release\php4nts.dll /libpath:..\Zend\Release_inline /libpath:..\TSRM\Release_TS_inline /libpath:..\..\bindlib_w32\Release !ENDIF @@ -520,10 +520,6 @@ # End Source File # Begin Source File -SOURCE=..\ext\mysql\php_mysql.c -# End Source File -# Begin Source File - SOURCE=..\ext\odbc\php_odbc.c # End Source File # Begin Source File @@ -702,10 +698,6 @@ # Begin Source File SOURCE=..\ext\standard\php_metaphone.h -# End Source File -# Begin Source File - -SOURCE=..\ext\mysql\php_mysql.h # End Source File # Begin Source File -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevThu Jun 26 11:31:48 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: libxml work use static libxml library Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.117 php-src/win32/php4dllts.dsp:1.118 --- php-src/win32/php4dllts.dsp:1.117 Thu Jun 26 10:19:42 2003 +++ php-src/win32/php4dllts.dsp Thu Jun 26 11:31:48 2003 @@ -55,7 +55,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 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:libcmt /out:..\Debug_TS\php4ts_debug.dll /pdbtype:sept /libpath:..\TSRM\Debug_TS /libpath:..\Zend\Debug_TS /libpath:..\..\bindlib_w32\Debug /libpath:Debug_TS /libpath:..\..\zlib\Debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:libcmt /out:..\Debug_TS\php4ts_debug.dll /pdbtype:sept /libpath:..\TSRM\Debug_TS /libpath:..\Zend\Debug_TS /libpath:..\..\bindlib_w32\Debug /libpath:Debug_TS /libpath:..\..\zlib\Debug /libpath:..\..\libxml\lib\Debug !ELSEIF $(CFG) == php4dllts - Win32 Release_TS @@ -81,7 +81,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 /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libcmt /out:..\Release_TS\php4ts.dll /libpath:..\TSRM\Release_TS /libpath:..\Zend\Release_TS /libpath:Release_TS /libpath:..\..\zlib\Release /libpath:..\..\bindlib_w32\Release +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libcmt /out:..\Release_TS\php4ts.dll /libpath:..\TSRM\Release_TS /libpath:..\Zend\Release_TS /libpath:Release_TS /libpath:..\..\bindlib_w32\Release /libpath:..\..\zlib\Release /libpath:..\..\libxml\lib\Release !ELSEIF $(CFG) == php4dllts - Win32 Release_TS_inline @@ -108,7 +108,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:libc.lib /nodefaultlib:libcmt.lib /out:Release_TS/php4ts.dll /libpath:TSRM\Release_TS /libpath:Zend\Release_TS /libpath:..\bindlib_w32\Release -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libcmt /out:..\Release_TS_inline\php4ts.dll /libpath:..\TSRM\Release_TS_inline /libpath:..\Zend\Release_TS_inline /libpath:Release_TS_Inline /libpath:..\..\zlib\Release /libpath:..\..\bindlib_w32\Release +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libcmt /out:..\Release_TS_inline\php4ts.dll /libpath:..\TSRM\Release_TS_inline /libpath:..\Zend\Release_TS_inline /libpath:Release_TS_Inline /libpath:..\..\bindlib_w32\Release /libpath:..\..\zlib\Release /libpath:..\..\libxml\lib\Release !ELSEIF $(CFG) == php4dllts - Win32 Release_TSDbg @@ -135,7 +135,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libc.lib /nodefaultlib:libcmt.lib /out:..\Release_TS\php4ts.dll /libpath:..\TSRM\Release_TS /libpath:..\Zend\Release_TS
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
sebastian Thu Jun 26 11:57:04 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: Leftovers. Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.118 php-src/win32/php4dllts.dsp:1.119 --- php-src/win32/php4dllts.dsp:1.118 Thu Jun 26 11:31:48 2003 +++ php-src/win32/php4dllts.dsp Thu Jun 26 11:57:03 2003 @@ -134,7 +134,7 @@ # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libc.lib /nodefaultlib:libcmt.lib /out:..\Release_TS\php4ts.dll /libpath:..\TSRM\Release_TS /libpath:..\Zend\Release_TS /libpath:..\..\bindlib_w32\Release /libpath:Release_TS +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:libc.lib /nodefaultlib:libcmt.lib /out:..\Release_TS\php4ts.dll /libpath:..\TSRM\Release_TS /libpath:..\Zend\Release_TS /libpath:..\..\bindlib_w32\Release /libpath:Release_TS # ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:libcmt /out:..\Release_TSDbg\php4ts.dll /libpath:..\TSRM\Release_TSDbg /libpath:..\Zend\Release_TSDbg /libpath:Release_TSDbg /libpath:..\..\bindlib_w32\Release /libpath:..\..\zlib\Release /libpath:..\..\libxml\lib\Release !ENDIF @@ -1708,10 +1708,6 @@ # End Source File # Begin Source File -SOURCE=..\ext\mysql\php_mysql.c -# End Source File -# Begin Source File - SOURCE=..\ext\odbc\php_odbc.c # End Source File # Begin Source File @@ -1904,10 +1900,6 @@ # Begin Source File SOURCE=..\ext\mcal\php_mcal.h -# End Source File -# Begin Source File - -SOURCE=..\ext\mysql\php_mysql.h # End Source File # Begin Source File -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main logos.h
zeevThu Jun 26 13:30:41 2003 EDT
Modified files:
/php-src/main logos.h
Log:
New logo (not final yet...)
Index: php-src/main/logos.h
diff -u php-src/main/logos.h:1.10 php-src/main/logos.h:1.11
--- php-src/main/logos.h:1.10 Tue Jun 10 16:03:41 2003
+++ php-src/main/logos.hThu Jun 26 13:30:41 2003
@@ -16,456 +16,226 @@
+--+
*/
-/* $Id: logos.h,v 1.10 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: logos.h,v 1.11 2003/06/26 17:30:41 zeev Exp $ */
#define CONTEXT_TYPE_IMAGE_GIF Content-Type: image/gif
unsigned char zend_logo[] = {
-71, 73, 70, 56, 57, 97, 100, 0, 58, 0,
- 247, 255, 0, 255, 255, 255, 8, 8, 8, 24,
-24, 24, 57, 57, 57, 74, 74, 74, 90, 90,
-90, 99, 99, 99, 123, 123, 123, 132, 132, 132,
- 140, 140, 140, 148, 148, 148, 189, 189, 189, 214,
- 214, 214, 231, 231, 231, 239, 239, 239, 90, 99,
-99, 222, 231, 239, 57, 66, 74, 165, 173, 181,
- 0, 8, 16, 214, 222, 231, 57, 66, 82, 16,
-33, 66, 0, 8, 24, 24, 41, 82, 222, 231,
- 255, 57, 66, 90, 198, 206, 231, 181, 189, 214,
-99, 107, 132, 0, 8, 33, 189, 198, 231, 123,
- 132, 165, 148, 165, 231, 123, 140, 206, 123, 148,
- 239, 49, 66, 132, 24, 33, 66, 49, 74, 165,
- 214, 222, 255, 206, 214, 247, 181, 189, 222, 148,
- 156, 189, 123, 132, 173, 156, 173, 247, 132, 148,
- 214, 99, 115, 181, 49, 57, 90, 41, 49, 82,
-90, 107, 181, 82, 99, 173, 24, 33, 74, 57,
-82, 189, 49, 74, 173, 16, 24, 57, 8, 16,
-49, 198, 206, 247, 181, 189, 231, 165, 173, 214,
-99, 107, 148, 74, 82, 123, 140, 156, 239, 66,
-74, 115, 115, 132, 222, 41, 49, 90, 57, 74,
- 165, 49, 66, 148, 49, 66, 156, 41, 57, 140,
-57, 82, 206, 33, 49, 123, 57, 82, 214, 16,
-24, 66, 198, 206, 255, 181, 189, 239, 189, 198,
- 255, 156, 165, 214, 140, 148, 198, 132, 140, 189,
- 115, 123, 173, 90, 99, 148, 132, 148, 247, 123,
- 140, 239, 107, 123, 214, 115, 132, 231, 57, 66,
- 115, 107, 123, 222, 115, 132, 239, 57, 66, 123,
-99, 115, 214, 90, 107, 214, 74, 90, 181, 74,
-90, 189, 66, 82, 173, 57, 74, 173, 49, 66,
- 165, 66, 90, 231, 49, 66, 173, 24, 33, 90,
-41, 57, 156, 33, 49, 140, 8, 16, 66, 181,
- 189, 247, 165, 173, 231, 148, 156, 214, 132, 140,
- 198, 115, 123, 181, 82, 90, 148, 49, 57, 115,
-99, 115, 231, 90, 107, 231, 82, 99, 214, 82,
-99, 222, 74, 90, 206, 82, 99, 231, 66, 82,
- 189, 33, 41, 99, 57, 74, 189, 57, 74, 198,
-57, 74, 206, 49, 66, 181, 41, 57, 165, 24,
-33, 99, 16, 24, 82, 8, 16, 74, 173, 181,
- 247, 173, 181, 255, 165, 173, 247, 140, 148, 214,
- 156, 165, 239, 165, 173, 255, 156, 165, 247, 132,
- 140, 214, 140, 148, 231, 99, 107, 173, 107, 115,
- 189, 115, 123, 206, 123, 132, 222, 99, 107, 189,
-82, 90, 165, 90, 99, 181, 74, 82, 156, 82,
-90, 173, 90, 99, 189, 66, 74, 140, 57, 66,
- 140, 57, 66, 148, 41, 49, 115, 74, 90, 222,
-74, 90, 231, 41, 49, 132, 66, 82, 222, 33,
-41, 115, 33, 41, 123, 24, 33, 107, 24, 33,
- 123, 16, 24, 90, 148, 156, 247, 140, 148, 239,
- 132, 140, 231, 140, 148, 247, 132, 140, 239, 123,
- 132, 231, 107, 115, 206, 123, 132, 239, 123, 132,
- 247, 99, 107, 206, 99, 107, 214, 82, 90, 181,
-90, 99, 206, 49, 57, 148, 41, 49, 148, 33,
-41, 140, 239, 239, 247, 247, 247, 255, 198, 198,
- 206, 214, 214, 222, 173, 173, 181, 189, 189, 198,
- 148, 148, 156, 156, 156, 165, 231, 231, 247, 239,
- 239, 255, 173, 173, 189, 90, 90, 99, 231, 231,
- 255, 222, 222, 247, 140, 140, 156, 66, 66, 74,
- 132, 132, 148, 198, 198, 222, 123, 123, 140, 173,
- 173, 198, 107, 107, 123, 222, 222, 255, 57, 57,
-66, 49, 49, 57, 156, 156, 181, 198, 198, 231,
- 140, 140, 165, 181, 181, 214, 90, 90, 107, 214,
- 214, 255, 165, 165, 198, 82, 82, 99, 123, 123,
- 148, 74, 74, 90, 115, 115, 140, 33, 33, 41,
-99, 99, 123, 156, 156, 198, 90, 90, 115, 132,
- 132, 173, 173, 173, 231, 165, 165, 222, 24, 24,
-33, 82, 82, 115, 156, 156, 222, 115, 115, 165,
-57, 57, 82, 107, 107, 156, 123, 123, 181, 33,
-33, 49, 156, 156, 231, 82, 82, 123, 49, 49,
-74, 107, 107, 165, 74, 74, 115, 148, 148, 231,
-57, 57, 90, 41, 41, 66, 82, 82, 132, 66,
-66, 107, 132, 132, 214, 140, 140, 231, 99, 99,
- 165, 123, 123, 206, 66, 66, 115, 82, 82, 148,
- 123, 123, 222,
[PHP-CVS] cvs: php-src /ext/ircg ircg.c php_ircg_formats.h
sas Thu Jun 26 14:06:20 2003 EDT
Modified files:
/php-src/ext/ircg ircg.c php_ircg_formats.h
Log:
Add NOTICE handling
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.189 php-src/ext/ircg/ircg.c:1.190
--- php-src/ext/ircg/ircg.c:1.189 Tue Jun 17 19:35:19 2003
+++ php-src/ext/ircg/ircg.c Thu Jun 26 14:06:20 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ircg.c,v 1.189 2003/06/17 23:35:19 sas Exp $ */
+/* $Id: ircg.c,v 1.190 2003/06/26 18:06:20 sas Exp $ */
/* {{{ includes */
@@ -184,8 +184,8 @@
static char *fmt_msgs_default[] = {
[%c] %f: %mbr /,
- privat from %f: %mbr /,
- %f privat to %t: %mbr /,
+ private from %f: %mbr /,
+ %f private to %t: %mbr /,
%f leaves %cbr /,
%f joins %cbr /,
%t was kicked by %f from %c (%m)br /,
@@ -215,6 +215,9 @@
is on server %t, has flag %f, hopcount %m, and channel %c.br /,
end of whobr /,
%f is inviting %t to %cbr /,
+ [notice %c] %f: %mbr /,
+ notice from %f: %mbr /,
+ notice to %t: %mbr /,
};
ZEND_DECLARE_MODULE_GLOBALS(ircg);
@@ -560,7 +563,6 @@
}
}
}
-
static void msg_handler(irconn_t *ircc, smart_str *chan, smart_str *from,
smart_str *msg, void *conn_data, void *chan_data)
@@ -583,6 +585,27 @@
msg_send(conn, m);
}
+static void notice_handler(irconn_t *ircc, smart_str *chan, smart_str *from,
+ smart_str *msg, void *conn_data, void *chan_data)
+{
+ php_irconn_t *conn = conn_data;
+ smart_str m = {0};
+ smart_str s_username;
+
+ smart_str_setl(s_username, ircc-username, ircc-username_len);
+
+ if (msg-c[0] == '\001') {
+ handle_ctcp(conn, chan, from, chan?chan:NULL, msg, m);
+ } else if (chan) {
+ FORMAT_MSG(conn, FMT_MSG_NOTICE_CHAN, chan, s_username, from, msg,
m, conn-conn.username, conn-conn.username_len);
+ } else {
+ FORMAT_MSG(conn, FMT_MSG_NOTICE_TO_ME, NULL, s_username, from,
+ msg, m, conn-conn.username, conn-conn.username_len);
+ }
+
+ msg_send(conn, m);
+}
+
static void nick_handler(irconn_t *c, smart_str *oldnick, smart_str *newnick,
void *dummy)
{
@@ -1803,6 +1826,7 @@
IRCG_CB_MAP_ENTRY(whoreply_handler)
IRCG_CB_MAP_ENTRY(endofwho_handler)
IRCG_CB_MAP_ENTRY(invite_handler)
+ IRCG_CB_MAP_ENTRY(notice_handler)
IRCG_CB_MAP_END()
/* {{{ register_hooks */
@@ -1892,6 +1916,8 @@
IFMSG(FMT_MSG_INVITE, IRCG_INVITE, invite_handler);
#endif
+ irc_register_hook(conn, IRCG_NOTICE, notice_handler);
+
irc_set_map_handle(conn, php_ircg_cb_msg_handle);
}
/* }}} */
Index: php-src/ext/ircg/php_ircg_formats.h
diff -u php-src/ext/ircg/php_ircg_formats.h:1.1 php-src/ext/ircg/php_ircg_formats.h:1.2
--- php-src/ext/ircg/php_ircg_formats.h:1.1 Mon Dec 9 07:42:28 2002
+++ php-src/ext/ircg/php_ircg_formats.h Thu Jun 26 14:06:20 2003
@@ -32,6 +32,9 @@
FMT_MSG_WHOREPLY2,
FMT_MSG_ENDOFWHO,
FMT_MSG_INVITE,
+ FMT_MSG_NOTICE_CHAN,
+ FMT_MSG_NOTICE_TO_ME,
+ FMT_MSG_NOTICE_FROM_ME,
NO_FMTS
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/cpdf config.m4
sniper Thu Jun 26 14:06:46 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/cpdf config.m4 Log: Fixed bug #24261 Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.10.4.3 php-src/ext/cpdf/config.m4:1.10.4.4 --- php-src/ext/cpdf/config.m4:1.10.4.3 Sat Jun 14 08:58:18 2003 +++ php-src/ext/cpdf/config.m4 Thu Jun 26 14:06:46 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.10.4.3 2003/06/14 12:58:18 sniper Exp $ +dnl $Id: config.m4,v 1.10.4.4 2003/06/26 18:06:46 sniper Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ AC_ARG_WITH(jpeg-dir, @@ -52,13 +52,13 @@ [ PHP_WITH_SHARED if test $withval != no; then +cpdf_withval=$withval 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 +for i in $cpdf_withval /usr /usr/local; do if test -f $i/include/cpdflib.h; then CPDFLIB_INCLUDE=$i/include AC_MSG_CHECKING(for cpdflib.h) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/math bug24142.phpt
And that is the wrong result. Where did you learn your math? Rounding happens UP when the number to be rounded is = 5.. --Jani On Thu, 26 Jun 2003, Sterling Hughes wrote: sterling Wed Jun 25 23:21:45 2003 EDT Modified files: /php-src/ext/standard/tests/math bug24142.phpt Log: according to the notes in the bugs database, this is the correct result. this result is also the same one given in 4.3.2 and 5.0 Index: php-src/ext/standard/tests/math/bug24142.phpt diff -u php-src/ext/standard/tests/math/bug24142.phpt:1.2 php-src/ext/standard/tests/math/bug24142.phpt:1.3 --- php-src/ext/standard/tests/math/bug24142.phpt:1.2 Mon Jun 16 15:59:27 2003 +++ php-src/ext/standard/tests/math/bug24142.phpt Wed Jun 25 23:21:45 2003 @@ -1,10 +1,10 @@ --TEST-- Bug #24142 (round() problems) --FILE-- -?php // $Id: bug24142.phpt,v 1.2 2003/06/16 19:59:27 sniper Exp $ vim600:syn=php +?php // $Id: bug24142.phpt,v 1.3 2003/06/26 03:21:45 sterling Exp $ vim600:syn=php echo round(5.045, 2). \n; echo round(5.055, 2). \n; ? --EXPECT-- +5.04 5.05 -5.06 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard var_unserializer.cvar_unserializer.re
MFH? (Ilia...you should be doing this..)
--Jani
On Thu, 26 Jun 2003, Sterling Hughes wrote:
sterling Wed Jun 25 23:24:11 2003 EDT
Modified files:
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
fix by ilia to fix crashes in the session extension when /tmp/sess_* files
previously existed. make test now passes fully with the session extension.
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.25
php-src/ext/standard/var_unserializer.c:1.26
--- php-src/ext/standard/var_unserializer.c:1.25 Tue Jun 10 16:03:39 2003
+++ php-src/ext/standard/var_unserializer.cWed Jun 25 23:24:11 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Sat May 24 19:11:12 2003 */
-#line 1 /usr/src/php5/ext/standard/var_unserializer.re
+/* Generated by re2c 0.5 on Wed Jun 25 23:00:04 2003 */
+#line 1 /home/rei/PHP_CVS/php-src/ext/standard/var_unserializer.re
/*
+--+
| PHP Version 4|
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var_unserializer.c,v 1.25 2003/06/10 20:03:39 imajes Exp $ */
+/* $Id: var_unserializer.c,v 1.26 2003/06/26 03:24:11 sterling Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -339,7 +339,7 @@
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy74;
yy4:
-#line 441
+#line 440
{ return 0; }
yy5: yych = *++YYCURSOR;
if(yych == ';') goto yy72;
@@ -374,7 +374,7 @@
goto yy4;
yy13: yych = *++YYCURSOR;
yy14:
-#line 435
+#line 434
{
/* this is the case where we have less data than planned */
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of serialized
data);
@@ -398,7 +398,7 @@
if(yych != '') goto yy2;
yy21: yych = *++YYCURSOR;
yy22:
-#line 350
+#line 349
{
int len;
int elements;
@@ -505,7 +505,7 @@
if(yych != '') goto yy2;
yy28: yych = *++YYCURSOR;
yy29:
-#line 342
+#line 341
{
INIT_PZVAL(*rval);
@@ -535,7 +535,7 @@
if(yych != '{') goto yy2;
yy35: yych = *++YYCURSOR;
yy36:
-#line 324
+#line 323
{
int elements = parse_iv(start + 2);
@@ -575,7 +575,7 @@
if(yych != '') goto yy2;
yy42: yych = *++YYCURSOR;
yy43:
-#line 304
+#line 303
{
int len;
char *str;
@@ -652,7 +652,7 @@
}
yy51: yych = *++YYCURSOR;
yy52:
-#line 297
+#line 296
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -725,7 +725,7 @@
if(yych != ';') goto yy2;
yy64: yych = *++YYCURSOR;
yy65:
-#line 290
+#line 289
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -752,7 +752,7 @@
if(yych != ';') goto yy2;
yy70: yych = *++YYCURSOR;
yy71:
-#line 283
+#line 282
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -761,7 +761,7 @@
}
yy72: yych = *++YYCURSOR;
yy73:
-#line 276
+#line 275
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -800,7 +800,6 @@
return 0;
}
- zval_ptr_dtor(rval);
*rval = *rval_ref;
(*rval)-refcount++;
(*rval)-is_ref = 1;
@@ -808,7 +807,7 @@
return 1;
}
}
-#line 443
+#line 442
return 0;
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.17
php-src/ext/standard/var_unserializer.re:1.18
--- php-src/ext/standard/var_unserializer.re:1.17 Tue Jun 10 16:03:39 2003
+++ php-src/ext/standard/var_unserializer.re Wed Jun 25 23:24:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: var_unserializer.re,v 1.17 2003/06/10 20:03:39 imajes Exp $ */
+/* $Id: var_unserializer.re,v 1.18 2003/06/26 03:24:11 sterling Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -265,7 +265,6 @@
return 0;
}
- zval_ptr_dtor(rval);
*rval = *rval_ref;
(*rval)-refcount++;
(*rval)-is_ref = 1;
--
https://www.paypal.com/xclick/[EMAIL PROTECTED]no_note=1tax=0currency_code=EUR
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/cpdf config.m4
sniper Thu Jun 26 14:15:56 2003 EDT Modified files: /php-src/ext/cpdf config.m4 Log: MFB Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.14 php-src/ext/cpdf/config.m4:1.15 --- php-src/ext/cpdf/config.m4:1.14 Sat Jun 14 08:57:38 2003 +++ php-src/ext/cpdf/config.m4 Thu Jun 26 14:15:56 2003 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2003/06/14 12:57:38 sniper Exp $ +dnl $Id: config.m4,v 1.15 2003/06/26 18:15:56 sniper Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ AC_ARG_WITH(jpeg-dir, @@ -52,13 +52,13 @@ [ PHP_WITH_SHARED if test $withval != no; then +cpdf_withval=$withval 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 +for i in $cpdf_withval /usr /usr/local; do if test -f $i/include/cpdflib.h; then CPDFLIB_INCLUDE=$i/include AC_MSG_CHECKING(for cpdflib.h) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl config.m4
helly Thu Jun 26 14:51:53 2003 EDT Modified files: /php-src/ext/xslconfig.m4 Log: ext/xsl requires ext/dom Index: php-src/ext/xsl/config.m4 diff -u php-src/ext/xsl/config.m4:1.3 php-src/ext/xsl/config.m4:1.4 --- php-src/ext/xsl/config.m4:1.3 Wed Jun 11 15:27:01 2003 +++ php-src/ext/xsl/config.m4 Thu Jun 26 14:51:52 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2003/06/11 19:27:01 rrichards Exp $ +dnl $Id: config.m4,v 1.4 2003/06/26 18:51:52 helly Exp $ dnl AC_DEFUN(PHP_XSL_CHECK_VERSION,[ @@ -22,6 +22,10 @@ PHP_ARG_WITH(xsl, for XSL support, [ --with-xsl[=DIR]Include new XSL support (requires libxslt = 1.0.18). DIR is the libxslt install directory.]) + +if test $PHP_XSL != no -a $PHP_DOM == no; then +AC_MSG_ERROR([XSL extension requires DOM extension, add --with-dom.]) +fi if test $PHP_XSL != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
helly Thu Jun 26 15:07:17 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fix memleak
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.62 php-src/ext/sqlite/sqlite.c:1.63
--- php-src/ext/sqlite/sqlite.c:1.62Wed Jun 25 19:21:10 2003
+++ php-src/ext/sqlite/sqlite.c Thu Jun 26 15:07:17 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.62 2003/06/25 23:21:10 helly Exp $
+ $Id: sqlite.c,v 1.63 2003/06/26 19:07:17 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -935,7 +935,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.62 2003/06/25 23:21:10 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.63 2003/06/26 19:07:17 helly Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1030,6 +1030,9 @@
filename, filename_len, mode, errmsg)) {
return;
}
+ if (errmsg) {
+ zval_dtor(errmsg);
+ }
if (strncmp(filename, :memory:, sizeof(:memory:) - 1)) {
/* resolve the fully-qualified path name to use as the hash key */
@@ -1095,6 +1098,9 @@
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return;
}
+ if (errmsg) {
+ zval_dtor(errmsg);
+ }
if (strncmp(filename, :memory:, sizeof(:memory:) - 1)) {
if (PG(safe_mode) (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
@@ -1136,6 +1142,9 @@
filename, filename_len, mode, errmsg)) {
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
RETURN_NULL();
+ }
+ if (errmsg) {
+ zval_dtor(errmsg);
}
if (PG(safe_mode) (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 EngineSelect.bat EngineSelect.dsp php5ts.dsw
sas Thu Jun 26 15:19:44 2003 EDT
Added files:
/php-src/win32 EngineSelect.bat EngineSelect.dsp
Modified files:
/php-src/win32 php5ts.dsw
Log:
Committing engine select project
This is a noop in an already setup tree.
When necessary, it renames ZendEngine2 to Zend permanently.
This occurs only after a fresh checkout (not after an update!).
Index: php-src/win32/php5ts.dsw
diff -u php-src/win32/php5ts.dsw:1.18 php-src/win32/php5ts.dsw:1.19
--- php-src/win32/php5ts.dsw:1.18 Mon Jun 23 00:27:11 2003
+++ php-src/win32/php5ts.dswThu Jun 26 15:19:44 2003
@@ -3,6 +3,18 @@
###
+Project: EngineSelect=.\EngineSelect.dsp - Package Owner=4
+
+Package=5
+{{{
+}}}
+
+Package=4
+{{{
+}}}
+
+###
+
Project: TSRM=..\TSRM\TSRM.dsp - Package Owner=4
Package=5
@@ -25,6 +37,9 @@
{{{
Begin Project Dependency
Project_Dep_Name TSRM
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name EngineSelect
End Project Dependency
}}}
Index: php-src/win32/EngineSelect.bat
+++ php-src/win32/EngineSelect.bat
@if exist ..\ZendEngine2\OBJECTS2_HOWTO (
move ..\Zend ..\ZendEngine1
move ..\ZendEngine2 ..\Zend
echo PLEASE RESTART VISUAL C++ TO RELOAD THE ZEND PROJECT.
exit 1 )
Index: php-src/win32/EngineSelect.dsp
+++ php-src/win32/EngineSelect.dsp
# Microsoft Developer Studio Project File - Name=EngineSelect - Package Owner=4
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** NICHT BEARBEITEN **
# TARGTYPE Win32 (x86) External Target 0x0106
CFG=EngineSelect - Win32 Debug
!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
!MESSAGE verwenden Sie den Befehl Makefile exportieren und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f EngineSelect.mak.
!MESSAGE
!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f EngineSelect.mak CFG=EngineSelect - Win32 Debug
!MESSAGE
!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
!MESSAGE EngineSelect - Win32 Release (basierend auf Win32 (x86) External Target)
!MESSAGE EngineSelect - Win32 Debug (basierend auf Win32 (x86) External Target)
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName
# PROP Scc_LocalPath
!IF $(CFG) == EngineSelect - Win32 Release
# PROP BASE Use_MFC
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir Release
# PROP BASE Intermediate_Dir Release
# PROP BASE Cmd_Line NMAKE /f EngineSelect.mak
# PROP BASE Rebuild_Opt /a
# PROP BASE Target_File EngineSelect.exe
# PROP BASE Bsc_Name EngineSelect.bsc
# PROP BASE Target_Dir
# PROP Use_MFC
# PROP Use_Debug_Libraries 0
# PROP Output_Dir Release
# PROP Intermediate_Dir Release
# PROP Cmd_Line EngineSelect.bat
# PROP Rebuild_Opt /a
# PROP Target_File EngineSelect.exe
# PROP Bsc_Name
# PROP Target_Dir
!ELSEIF $(CFG) == EngineSelect - Win32 Debug
# PROP BASE Use_MFC
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir Debug
# PROP BASE Intermediate_Dir Debug
# PROP BASE Cmd_Line NMAKE /f EngineSelect.mak
# PROP BASE Rebuild_Opt /a
# PROP BASE Target_File EngineSelect.exe
# PROP BASE Bsc_Name EngineSelect.bsc
# PROP BASE Target_Dir
# PROP Use_MFC
# PROP Use_Debug_Libraries 1
# PROP Output_Dir Debug
# PROP Intermediate_Dir Debug
# PROP Cmd_Line EngineSelect.bat
# PROP Rebuild_Opt /a
# PROP Target_File EngineSelect.exe
# PROP Bsc_Name
# PROP Target_Dir
!ENDIF
# Begin Target
# Name EngineSelect - Win32 Release
# Name EngineSelect - Win32 Debug
!IF $(CFG) == EngineSelect - Win32 Release
!ELSEIF $(CFG) == EngineSelect - Win32 Debug
!ENDIF
# Begin Group Quellcodedateien
# PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
# End Group
# Begin Group Header-Dateien
# PROP Default_Filter h;hpp;hxx;hm;inl
# End Group
# Begin Group Ressourcendateien
# PROP Default_Filter ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe
# End Group
# End Target
# End Project
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite php_sqlite.h sqlite.c /ext/sqlite/tests sqlite_oo_016.phpt
helly Thu Jun 26 15:26:26 2003 EDT
Modified files:
/php-src/ext/sqlite php_sqlite.h sqlite.c
/php-src/ext/sqlite/tests sqlite_oo_016.phpt
Log:
Rename sqlite_fetch_string() to sqlite_fetch_single() + alias
Index: php-src/ext/sqlite/php_sqlite.h
diff -u php-src/ext/sqlite/php_sqlite.h:1.23 php-src/ext/sqlite/php_sqlite.h:1.24
--- php-src/ext/sqlite/php_sqlite.h:1.23Wed Jun 25 12:59:24 2003
+++ php-src/ext/sqlite/php_sqlite.h Thu Jun 26 15:26:26 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: php_sqlite.h,v 1.23 2003/06/25 16:59:24 iliaa Exp $
+ $Id: php_sqlite.h,v 1.24 2003/06/26 19:26:26 helly Exp $
*/
#ifndef PHP_SQLITE_H
@@ -51,7 +51,7 @@
PHP_FUNCTION(sqlite_single_query);
PHP_FUNCTION(sqlite_fetch_array);
-PHP_FUNCTION(sqlite_fetch_string);
+PHP_FUNCTION(sqlite_fetch_single);
PHP_FUNCTION(sqlite_fetch_all);
PHP_FUNCTION(sqlite_current);
PHP_FUNCTION(sqlite_column);
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.63 php-src/ext/sqlite/sqlite.c:1.64
--- php-src/ext/sqlite/sqlite.c:1.63Thu Jun 26 15:07:17 2003
+++ php-src/ext/sqlite/sqlite.c Thu Jun 26 15:26:26 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.63 2003/06/26 19:07:17 helly Exp $
+ $Id: sqlite.c,v 1.64 2003/06/26 19:26:26 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -164,7 +164,8 @@
PHP_FE(sqlite_array_query, NULL)
PHP_FE(sqlite_single_query, NULL)
PHP_FE(sqlite_fetch_array, NULL)
- PHP_FE(sqlite_fetch_string, NULL)
+ PHP_FE(sqlite_fetch_single, NULL)
+ PHP_FALIAS(sqlite_fetch_string, sqlite_fetch_single, NULL)
PHP_FE(sqlite_fetch_all, NULL)
PHP_FE(sqlite_current, NULL)
PHP_FE(sqlite_column, NULL)
@@ -214,7 +215,7 @@
function_entry sqlite_funcs_query[] = {
PHP_ME_MAPPING(fetch_array, sqlite_fetch_array, NULL)
- PHP_ME_MAPPING(fetch_string, sqlite_fetch_string, NULL)
+ PHP_ME_MAPPING(fetch_single, sqlite_fetch_single, NULL)
PHP_ME_MAPPING(fetch_all, sqlite_fetch_all, NULL)
PHP_ME_MAPPING(column, sqlite_column, NULL)
PHP_ME_MAPPING(changes, sqlite_changes, NULL)
@@ -234,7 +235,7 @@
function_entry sqlite_funcs_ub_query[] = {
PHP_ME_MAPPING(fetch_array, sqlite_fetch_array, NULL)
- PHP_ME_MAPPING(fetch_string, sqlite_fetch_string, NULL)
+ PHP_ME_MAPPING(fetch_single, sqlite_fetch_single, NULL)
PHP_ME_MAPPING(fetch_all, sqlite_fetch_all, NULL)
PHP_ME_MAPPING(column, sqlite_column, NULL)
PHP_ME_MAPPING(changes, sqlite_changes, NULL)
@@ -935,7 +936,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.63 2003/06/26 19:07:17 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.64 2003/06/26 19:26:26 helly Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1698,8 +1699,8 @@
}
/* }}} */
-/* {{{ php_sqlite_fetch_string */
-static void php_sqlite_fetch_string(struct php_sqlite_result *res, zend_bool
decode_binary, zval *return_value TSRMLS_DC)
+/* {{{ php_sqlite_fetch_single */
+static void php_sqlite_fetch_single(struct php_sqlite_result *res, zend_bool
decode_binary, zval *return_value TSRMLS_DC)
{
const char **rowdata;
char *decoded;
@@ -1805,7 +1806,7 @@
while (rres-curr_row rres-nrows) {
MAKE_STD_ZVAL(ent);
- php_sqlite_fetch_string(rres, decode_binary, ent TSRMLS_CC);
+ php_sqlite_fetch_single(rres, decode_binary, ent TSRMLS_CC);
/* if set and we only have 1 row in the result set, return the result
as a string. */
if (srow) {
@@ -1830,7 +1831,7 @@
/* {{{ proto string sqlite_fetch_array(resource result [, bool decode_binary])
Fetches first column of a result set as a string */
-PHP_FUNCTION(sqlite_fetch_string)
+PHP_FUNCTION(sqlite_fetch_single)
{
zval *zres;
zend_bool decode_binary = 1;
@@ -1849,7 +1850,7 @@
ZEND_FETCH_RESOURCE(res, struct php_sqlite_result *, zres, -1,
sqlite result, le_sqlite_result);
}
- php_sqlite_fetch_string(res, decode_binary, return_value TSRMLS_CC);
+ php_sqlite_fetch_single(res, decode_binary, return_value TSRMLS_CC);
}
/* }}} */
Index: php-src/ext/sqlite/tests/sqlite_oo_016.phpt
diff -u
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/math bug24142.phpt
On Thu, 26 Jun 2003, Jani Taskinen wrote: And that is the wrong result. Where did you learn your math? Rounding happens UP when the number to be rounded is = 5.. Only if it's 5.04501. If it's exact 5.045 then the bankers algorithm dictates that it should round down to 5.04 (and 5.055 should round up to 5.06). Derick -- Interpreting what the GPL actually means is a job best left to those that read the future by examining animal entrails. - Derick Rethans http://derickrethans.nl/ International PHP Magazine http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
helly Thu Jun 26 17:07:07 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
errmsg must be ref
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.64 php-src/ext/sqlite/sqlite.c:1.65
--- php-src/ext/sqlite/sqlite.c:1.64Thu Jun 26 15:26:26 2003
+++ php-src/ext/sqlite/sqlite.c Thu Jun 26 17:07:07 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.64 2003/06/26 19:26:26 helly Exp $
+ $Id: sqlite.c,v 1.65 2003/06/26 21:07:07 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -187,7 +187,7 @@
PHP_FE(sqlite_unbuffered_query, NULL)
PHP_FE(sqlite_create_aggregate, NULL)
PHP_FE(sqlite_create_function, NULL)
- PHP_FE(sqlite_factory, NULL)
+ PHP_FE(sqlite_factory, arg3_force_ref)
PHP_FE(sqlite_udf_encode_binary, NULL)
PHP_FE(sqlite_udf_decode_binary, NULL)
{NULL, NULL, NULL}
@@ -936,7 +936,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.64 2003/06/26 19:26:26 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.65 2003/06/26 21:07:07 helly Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
sterlingThu Jun 26 17:15:58 2003 EDT
Modified files:
/CVSROOTloginfo
Log:
send these to the appropriate mailing lists
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.95 CVSROOT/loginfo:1.96
--- CVSROOT/loginfo:1.95Wed Jun 25 19:45:55 2003
+++ CVSROOT/loginfo Thu Jun 26 17:15:58 2003
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.95 2003/06/25 23:45:55 sterling
Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.96 2003/06/26 21:15:58 sterling
Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -90,12 +90,12 @@
^pres$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
^portal $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-www$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-perl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-java $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-php$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^curl-cpp$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^curl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-www$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-perl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-java $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-php$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^curl-cpp$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
# misc stuff
^jpgraph $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/tests sqlite_016.phpt sqlite_oo_016.phpt
helly Thu Jun 26 17:37:54 2003 EDT
Modified files:
/php-src/ext/sqlite/tests sqlite_016.phpt sqlite_oo_016.phpt
Log:
MFB: Function was renamed (don't test an alias)
Index: php-src/ext/sqlite/tests/sqlite_016.phpt
diff -u php-src/ext/sqlite/tests/sqlite_016.phpt:1.2
php-src/ext/sqlite/tests/sqlite_016.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_016.phpt:1.2Sat Jun 14 15:42:32 2003
+++ php-src/ext/sqlite/tests/sqlite_016.phptThu Jun 26 17:37:54 2003
@@ -1,5 +1,5 @@
--TEST--
-sqlite: fetch string
+sqlite: fetch single
--INI--
sqlite.assoc_case=0
--SKIPIF--
@@ -23,12 +23,12 @@
echo BUFFERED\n;
$r = sqlite_query(SELECT a, b from strings, $db);
while (sqlite_has_more($r)) {
- var_dump(sqlite_fetch_string($r));
+ var_dump(sqlite_fetch_single($r));
}
echo UNBUFFERED\n;
$r = sqlite_unbuffered_query(SELECT a, b from strings, $db);
while (sqlite_has_more($r)) {
- var_dump(sqlite_fetch_string($r));
+ var_dump(sqlite_fetch_single($r));
}
echo DONE!\n;
?
Index: php-src/ext/sqlite/tests/sqlite_oo_016.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.2 Thu Jun 26 15:26:26 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_016.phpt Thu Jun 26 17:37:54 2003
@@ -1,5 +1,5 @@
--TEST--
-sqlite-oo: fetch string
+sqlite-oo: fetch single
--INI--
sqlite.assoc_case=0
--SKIPIF--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32 php4dllts.dsp
On Thu, 26 Jun 2003, Zeev Suraski wrote: zeev Thu Jun 26 11:31:48 2003 EDT Modified files: /php-src/win32php4dllts.dsp Log: libxml work use static libxml library Since this commit I'm getting undefined references to some iconv symbols. Adding iconv_a.lib to the php4dllts link line fixes the link errors. I'm using libxml 2.5.7 from http://www.zlatkovic.com/projects/libxml/binaries.html Maybe this is not required for older libxml versions.. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /build build2.mk buildcheck.sh
sas Thu Jun 26 20:19:26 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/build build2.mk buildcheck.sh Log: Eliminate need for automake/aclocal Index: php-src/build/build2.mk diff -u php-src/build/build2.mk:1.27 php-src/build/build2.mk:1.27.4.1 --- php-src/build/build2.mk:1.27Sun Jul 21 08:54:06 2002 +++ php-src/build/build2.mk Thu Jun 26 20:19:26 2003 @@ -14,7 +14,7 @@ # | Author: Sascha Schumann [EMAIL PROTECTED] | # +--+ # -# $Id: build2.mk,v 1.27 2002/07/21 12:54:06 sas Exp $ +# $Id: build2.mk,v 1.27.4.1 2003/06/27 00:19:26 sas Exp $ # include generated_lists @@ -52,8 +52,13 @@ touch $(TOUCH_FILES) aclocal.m4: configure.in acinclude.m4 - aclocal 21 | $(SUPPRESS_WARNINGS) - + @echo rebuilding $@ + @libtoolize=`./build/shtool path glibtoolize libtoolize`; \ + $$libtoolize --copy --automake; \ + ltpath=`dirname $$libtoolize`; \ + ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \ + cat acinclude.m4 $$ltfile $@ + configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ @autoconf 21 | $(SUPPRESS_WARNINGS) Index: php-src/build/buildcheck.sh diff -u php-src/build/buildcheck.sh:1.21.2.3 php-src/build/buildcheck.sh:1.21.2.4 --- php-src/build/buildcheck.sh:1.21.2.3Mon May 19 09:14:06 2003 +++ php-src/build/buildcheck.sh Thu Jun 26 20:19:26 2003 @@ -16,7 +16,7 @@ # | Sascha Schumann [EMAIL PROTECTED]| # +--+ # -# $Id: buildcheck.sh,v 1.21.2.3 2003/05/19 13:14:06 sniper Exp $ +# $Id: buildcheck.sh,v 1.21.2.4 2003/06/27 00:19:26 sas Exp $ # echo buildconf: checking installation... @@ -50,39 +50,17 @@ stamp= fi - -# automake 1.4 or newer -am_version=`automake --version 2/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` -am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'` -if test $am_version = ; then -echo buildconf: automake not found. -echoYou need automake version 1.4 or newer installed -echoto build PHP from CVS. -exit 1 -fi -IFS=.; set $am_version_clean; IFS=' ' -if test $1 = 1 -a $2 -lt 4 || test $1 -lt 1; then -echo buildconf: automake version $am_version found. -echoYou need automake version 1.4 or newer installed -echoto build PHP from CVS. -exit 1 -else -echo buildconf: automake version $am_version (ok) -fi - -# libtool 1.4.3 or newer -# Prefer glibtool over libtool for Mac OS X compatibility -libtool=`./build/shtool path glibtool 2 /dev/null` -if test ! -r $libtool; then libtool=`./build/shtool path libtool`; fi -lt_pversion=`$libtool --version 2/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'` +# libtoolize 1.4.3 or newer +# Prefer glibtoolize over libtoolize for Mac OS X compatibility +libtoolize=`./build/shtool path glibtoolize libtoolize 2 /dev/null` +lt_pversion=`$libtoolize --version 2/dev/null|sed -e 's/^[^0-9]*//'` if test $lt_pversion = ; then echo buildconf: libtool not found. echoYou need libtool version 1.4.3 or newer installed echoto build PHP from CVS. exit 1 fi -lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -IFS=.; set $lt_version; IFS=' ' +IFS=.; set $lt_pversion; IFS=' ' if test $3 = ; then third=0 @@ -100,12 +78,14 @@ exit 1 fi -am_prefix=`./build/shtool path automake | sed -e 's#/[^/]*/[^/]*$##'` -lt_prefix=`echo $libtool | sed -e 's#/[^/]*/[^/]*$##'` -if test $am_prefix != $lt_prefix; then -echo WARNING: automake and libtool are installed in different -echo directories. This may cause aclocal to fail. -echo continuing anyway +ltpath=`echo $libtoolize | sed -e 's#/[^/]*/[^/]*$##'` +ltfile=$ltpath/share/aclocal/libtool.m4 +if test -r $ltfile; then + : +else + echo buildconf: $ltfile does not exist. + echoPlease reinstall libtool. + exit 1 fi test -n $stamp touch $stamp -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /build build2.mk buildcheck.sh
sas Thu Jun 26 20:19:43 2003 EDT Modified files: /php-src/build build2.mk buildcheck.sh Log: Eliminate need for automake/aclocal Index: php-src/build/build2.mk diff -u php-src/build/build2.mk:1.28 php-src/build/build2.mk:1.29 --- php-src/build/build2.mk:1.28Tue Jun 10 16:03:25 2003 +++ php-src/build/build2.mk Thu Jun 26 20:19:43 2003 @@ -14,7 +14,7 @@ # | Author: Sascha Schumann [EMAIL PROTECTED] | # +--+ # -# $Id: build2.mk,v 1.28 2003/06/10 20:03:25 imajes Exp $ +# $Id: build2.mk,v 1.29 2003/06/27 00:19:43 sas Exp $ # include generated_lists @@ -52,8 +52,13 @@ touch $(TOUCH_FILES) aclocal.m4: configure.in acinclude.m4 - aclocal 21 | $(SUPPRESS_WARNINGS) - + @echo rebuilding $@ + @libtoolize=`./build/shtool path glibtoolize libtoolize`; \ + $$libtoolize --copy --automake; \ + ltpath=`dirname $$libtoolize`; \ + ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \ + cat acinclude.m4 $$ltfile $@ + configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ @autoconf 21 | $(SUPPRESS_WARNINGS) Index: php-src/build/buildcheck.sh diff -u php-src/build/buildcheck.sh:1.26 php-src/build/buildcheck.sh:1.27 --- php-src/build/buildcheck.sh:1.26Tue Jun 10 16:03:25 2003 +++ php-src/build/buildcheck.sh Thu Jun 26 20:19:43 2003 @@ -16,7 +16,7 @@ # | Sascha Schumann [EMAIL PROTECTED]| # +--+ # -# $Id: buildcheck.sh,v 1.26 2003/06/10 20:03:25 imajes Exp $ +# $Id: buildcheck.sh,v 1.27 2003/06/27 00:19:43 sas Exp $ # echo buildconf: checking installation... @@ -50,39 +50,17 @@ stamp= fi - -# automake 1.4 or newer -am_version=`automake --version 2/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` -am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'` -if test $am_version = ; then -echo buildconf: automake not found. -echoYou need automake version 1.4 or newer installed -echoto build PHP from CVS. -exit 1 -fi -IFS=.; set $am_version_clean; IFS=' ' -if test $1 = 1 -a $2 -lt 4 || test $1 -lt 1; then -echo buildconf: automake version $am_version found. -echoYou need automake version 1.4 or newer installed -echoto build PHP from CVS. -exit 1 -else -echo buildconf: automake version $am_version (ok) -fi - -# libtool 1.4.3 or newer -# Prefer glibtool over libtool for Mac OS X compatibility -libtool=`./build/shtool path glibtool 2 /dev/null` -if test ! -r $libtool; then libtool=`./build/shtool path libtool`; fi -lt_pversion=`$libtool --version 2/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'` +# libtoolize 1.4.3 or newer +# Prefer glibtoolize over libtoolize for Mac OS X compatibility +libtoolize=`./build/shtool path glibtoolize libtoolize 2 /dev/null` +lt_pversion=`$libtoolize --version 2/dev/null|sed -e 's/^[^0-9]*//'` if test $lt_pversion = ; then echo buildconf: libtool not found. echoYou need libtool version 1.4.3 or newer installed echoto build PHP from CVS. exit 1 fi -lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -IFS=.; set $lt_version; IFS=' ' +IFS=.; set $lt_pversion; IFS=' ' if test $3 = ; then third=0 @@ -100,12 +78,14 @@ exit 1 fi -am_prefix=`./build/shtool path automake | sed -e 's#/[^/]*/[^/]*$##'` -lt_prefix=`echo $libtool | sed -e 's#/[^/]*/[^/]*$##'` -if test $am_prefix != $lt_prefix; then -echo WARNING: automake and libtool are installed in different -echo directories. This may cause aclocal to fail. -echo continuing anyway +ltpath=`echo $libtoolize | sed -e 's#/[^/]*/[^/]*$##'` +ltfile=$ltpath/share/aclocal/libtool.m4 +if test -r $ltfile; then + : +else + echo buildconf: $ltfile does not exist. + echoPlease reinstall libtool. + exit 1 fi test -n $stamp touch $stamp -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib config0.m4
sas Thu Jun 26 20:37:22 2003 EDT Modified files: /php-src/ext/zlib config0.m4 Log: Don't add -L/usr/lib Index: php-src/ext/zlib/config0.m4 diff -u php-src/ext/zlib/config0.m4:1.13 php-src/ext/zlib/config0.m4:1.14 --- php-src/ext/zlib/config0.m4:1.13Mon Dec 9 13:29:07 2002 +++ php-src/ext/zlib/config0.m4 Thu Jun 26 20:37:21 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config0.m4,v 1.13 2002/12/09 18:29:07 wez Exp $ +dnl $Id: config0.m4,v 1.14 2003/06/27 00:37:21 sas Exp $ dnl PHP_ARG_WITH(zlib,for ZLIB support, @@ -36,12 +36,17 @@ AC_MSG_ERROR(Cannot find libz) fi + case $ZLIB_DIR in + /usr) ac_extra= ;; + *) ac_extra=-L$ZLIB_DIR/lib ;; + esac + PHP_CHECK_LIBRARY(z, gzgets, [ AC_DEFINE(HAVE_ZLIB,1,[ ]) ],[ AC_MSG_ERROR(ZLIB extension requires zlib = 1.0.9) ],[ --L$ZLIB_DIR/lib +$ac_extra ]) PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4) /ext/zlib config0.m4
sas Thu Jun 26 20:37:43 2003 EDT Modified files: (Branch: PHP_4) /php-src/ext/zlib config0.m4 Log: MFH Don't add -L/usr/lib Index: php-src/ext/zlib/config0.m4 diff -u php-src/ext/zlib/config0.m4:1.12.2.1 php-src/ext/zlib/config0.m4:1.12.2.1.10.1 --- php-src/ext/zlib/config0.m4:1.12.2.1Mon Dec 9 13:28:03 2002 +++ php-src/ext/zlib/config0.m4 Thu Jun 26 20:37:42 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config0.m4,v 1.12.2.1 2002/12/09 18:28:03 wez Exp $ +dnl $Id: config0.m4,v 1.12.2.1.10.1 2003/06/27 00:37:42 sas Exp $ dnl PHP_ARG_WITH(zlib,for ZLIB support, @@ -36,12 +36,17 @@ AC_MSG_ERROR(Cannot find libz) fi + case $ZLIB_DIR in + /usr) ac_extra= ;; + *) ac_extra=-L$ZLIB_DIR/lib ;; + esac + PHP_CHECK_LIBRARY(z, gzgets, [ AC_DEFINE(HAVE_ZLIB,1,[ ]) ],[ AC_MSG_ERROR(ZLIB extension requires zlib = 1.0.9) ],[ --L$ZLIB_DIR/lib +$ac_extra ]) PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/zlib config0.m4
sas Thu Jun 26 20:37:53 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/zlib config0.m4 Log: MFH Don't add -L/usr/lib Index: php-src/ext/zlib/config0.m4 diff -u php-src/ext/zlib/config0.m4:1.12.2.1 php-src/ext/zlib/config0.m4:1.12.2.2 --- php-src/ext/zlib/config0.m4:1.12.2.1Mon Dec 9 13:28:03 2002 +++ php-src/ext/zlib/config0.m4 Thu Jun 26 20:37:53 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config0.m4,v 1.12.2.1 2002/12/09 18:28:03 wez Exp $ +dnl $Id: config0.m4,v 1.12.2.2 2003/06/27 00:37:53 sas Exp $ dnl PHP_ARG_WITH(zlib,for ZLIB support, @@ -36,12 +36,17 @@ AC_MSG_ERROR(Cannot find libz) fi + case $ZLIB_DIR in + /usr) ac_extra= ;; + *) ac_extra=-L$ZLIB_DIR/lib ;; + esac + PHP_CHECK_LIBRARY(z, gzgets, [ AC_DEFINE(HAVE_ZLIB,1,[ ]) ],[ AC_MSG_ERROR(ZLIB extension requires zlib = 1.0.9) ],[ --L$ZLIB_DIR/lib +$ac_extra ]) PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard file.c /main streams.c
pollita Thu Jun 26 21:46:30 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard file.c
/php-src/main streams.c
Log:
MFH: Plug memory leaks when freeing contexts (particularly options)
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.28 php-src/ext/standard/file.c:1.279.2.29
--- php-src/ext/standard/file.c:1.279.2.28 Thu Jun 26 21:32:26 2003
+++ php-src/ext/standard/file.c Thu Jun 26 21:46:30 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.28 2003/06/27 01:32:26 pollita Exp $ */
+/* $Id: file.c,v 1.279.2.29 2003/06/27 01:46:30 pollita Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -134,7 +134,12 @@
static ZEND_RSRC_DTOR_FUNC(file_context_dtor)
{
- php_stream_context_free((php_stream_context*)rsrc-ptr);
+ php_stream_context *context = (php_stream_context*)rsrc-ptr;
+ if (context-options) {
+ zval_ptr_dtor(context-options);
+ context-options = NULL;
+ }
+ php_stream_context_free(context);
}
static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC)
@@ -888,7 +893,6 @@
while (SUCCESS ==
zend_hash_get_current_data_ex(Z_ARRVAL_PP(wval), (void**)oval, opos)) {
if (HASH_KEY_IS_STRING ==
zend_hash_get_current_key_ex(Z_ARRVAL_PP(wval), okey, okey_len, num_key, 0, opos))
{
- ZVAL_ADDREF(*oval);
php_stream_context_set_option(context, wkey,
okey, *oval);
}
zend_hash_move_forward_ex(Z_ARRVAL_PP(wval), opos);
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.68 php-src/main/streams.c:1.125.2.69
--- php-src/main/streams.c:1.125.2.68 Fri May 30 21:37:44 2003
+++ php-src/main/streams.c Thu Jun 26 21:46:30 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.68 2003/05/31 01:37:44 sniper Exp $ */
+/* $Id: streams.c,v 1.125.2.69 2003/06/27 01:46:30 pollita Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2819,7 +2819,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: php-src(PHP_4_3) /main streams.c
pollita Thu Jun 26 23:40:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main streams.c
Log:
Plug *half* a leak in context notifiers.
We still need a check and zval_ptr_dtor(context-notifier-ptr); in the
php_stream_context_free function, but since ptr is supposed to be a general
purpose container we need to define how that will be done.
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.69 php-src/main/streams.c:1.125.2.70
--- php-src/main/streams.c:1.125.2.69 Thu Jun 26 21:46:30 2003
+++ php-src/main/streams.c Thu Jun 26 23:40:55 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.125.2.69 2003/06/27 01:46:30 pollita Exp $ */
+/* $Id: streams.c,v 1.125.2.70 2003/06/27 03:40:55 pollita Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2823,6 +2823,10 @@
zval_ptr_dtor(context-options);
context-options = NULL;
}
+ if (context-notifier) {
+ php_stream_notification_free(context-notifier);
+ context-notifier = NULL;
+ }
efree(context);
}
@@ -2831,6 +2835,7 @@
php_stream_context *context;
context = ecalloc(1, sizeof(php_stream_context));
+ context-notifier = NULL;
MAKE_STD_ZVAL(context-options);
array_init(context-options);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams streams.c
pollita Fri Jun 27 00:27:18 2003 EDT
Modified files:
/php-src/main/streams streams.c
Log:
MFB PHP_4_3 main/streams.c r-1.125.2.70
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.27 php-src/main/streams/streams.c:1.28
--- php-src/main/streams/streams.c:1.27 Mon Jun 16 14:19:14 2003
+++ php-src/main/streams/streams.c Fri Jun 27 00:27:18 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.27 2003/06/16 18:19:14 pollita Exp $ */
+/* $Id: streams.c,v 1.28 2003/06/27 04:27:18 pollita Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1622,6 +1622,10 @@
zval_ptr_dtor(context-options);
context-options = NULL;
}
+ if (context-notifier) {
+ php_stream_notification_free(context-notifier);
+ context-notifier = NULL;
+ }
efree(context);
}
@@ -1630,6 +1634,7 @@
php_stream_context *context;
context = ecalloc(1, sizeof(php_stream_context));
+ context-notifier = NULL;
MAKE_STD_ZVAL(context-options);
array_init(context-options);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
