Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
From: Moriyoshi Koizumi I preferred to use xmlInitThreads() because xmlInitParser() does a set of operations related to the libxml's memory maganer and I tried hard to prevent it from being initialised before the start-up of the Zend MM. Do you have any good idea to deal with them in a consistent way? xmlInitThreads currently doesnt do anything right now. It is just a function for future use. In a non threaded environment, it really doesnt matter. You can get away without even calling any init routines as they would be called upon the first invocation of the parser, but once you get into a threaded environment, libxml needs to initialize itself on the main thread. Unless there is a way to inject it after the start-up of the Zend MM, this is the only spot I know of to get the initialization in there. Other than for consistancy is there any problem in having it initialize before the Zend MM? Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache php4apache.dsp
edink Sun Jun 15 07:36:02 2003 EDT Modified files: /php4/sapi/apache php4apache.dsp Log: Fixed win32 build (mod_php4 - mod_php5) Index: php4/sapi/apache/php4apache.dsp diff -u php4/sapi/apache/php4apache.dsp:1.16 php4/sapi/apache/php4apache.dsp:1.17 --- php4/sapi/apache/php4apache.dsp:1.16Thu Feb 20 19:14:33 2003 +++ php4/sapi/apache/php4apache.dsp Sun Jun 15 07:36:02 2003 @@ -120,7 +120,7 @@ # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat # Begin Source File -SOURCE=.\mod_php4.c +SOURCE=.\mod_php5.c # End Source File # Begin Source File @@ -136,7 +136,7 @@ # PROP Default_Filter h;hpp;hxx;hm;inl # Begin Source File -SOURCE=.\mod_php4.h +SOURCE=.\mod_php5.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: php4 /sapi/nsapi nsapi.c
edink Sun Jun 15 07:48:47 2003 EDT
Modified files:
/php4/sapi/nsapinsapi.c
Log:
No need for this in the HEAD branch
Index: php4/sapi/nsapi/nsapi.c
diff -u php4/sapi/nsapi/nsapi.c:1.45 php4/sapi/nsapi/nsapi.c:1.46
--- php4/sapi/nsapi/nsapi.c:1.45Tue Jun 10 16:03:45 2003
+++ php4/sapi/nsapi/nsapi.c Sun Jun 15 07:48:47 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.45 2003/06/10 20:03:45 imajes Exp $ */
+/* $Id: nsapi.c,v 1.46 2003/06/15 11:48:47 edink Exp $ */
/*
* PHP includes
@@ -172,11 +172,6 @@
#define NSAPI_G(v) TSRMG(nsapi_globals_id, zend_nsapi_globals *, v)
-/* compatibility with PHP4_3 */
-#if !defined(OnUpdateLong)
-#define OnUpdateLong OnUpdateInt
-#endif
-
/* {{{ nsapi_functions[]
*
* Every user visible function must have an entry in nsapi_functions[].
@@ -203,7 +198,7 @@
NULL,
NULL,
PHP_MINFO(nsapi),
- $Id: nsapi.c,v 1.45 2003/06/10 20:03:45 imajes Exp $,
+ $Id: nsapi.c,v 1.46 2003/06/15 11:48:47 edink Exp $,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/nsapi nsapi.c
edink Sun Jun 15 07:50:17 2003 EDT
Modified files:
/php4/sapi/nsapinsapi.c
Log:
Fixed ZTS build
Index: php4/sapi/nsapi/nsapi.c
diff -u php4/sapi/nsapi/nsapi.c:1.46 php4/sapi/nsapi/nsapi.c:1.47
--- php4/sapi/nsapi/nsapi.c:1.46Sun Jun 15 07:48:47 2003
+++ php4/sapi/nsapi/nsapi.c Sun Jun 15 07:50:17 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.46 2003/06/15 11:48:47 edink Exp $ */
+/* $Id: nsapi.c,v 1.47 2003/06/15 11:50:17 edink Exp $ */
/*
* PHP includes
@@ -198,7 +198,7 @@
NULL,
NULL,
PHP_MINFO(nsapi),
- $Id: nsapi.c,v 1.46 2003/06/15 11:48:47 edink Exp $,
+ $Id: nsapi.c,v 1.47 2003/06/15 11:50:17 edink Exp $,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -337,7 +337,7 @@
RETURN_FALSE;
} else {
php_end_ob_buffers(1 TSRMLS_CC);
- php_header();
+ php_header(TSRMLS_C);
/* do the sub-request */
/* thanks to Chris Elving from Sun for this code sniplet */
@@ -422,7 +422,7 @@
RETURN_FALSE;
}
- php_header();
+ php_header(TSRMLS_C);
for (i=0; i rc-rq-srvhdrs-hsize; i++) {
entry=rc-rq-srvhdrs-ht[i];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
Hi, Rob Richards [EMAIL PROTECTED] wrote: xmlInitThreads currently doesnt do anything right now. It is just a function for future use. In a non threaded environment, it really doesnt matter. You can get away without even calling any init routines as they would be called upon the first invocation of the parser, but once you get into a threaded environment, libxml needs to initialize itself on the main thread. Well, virtually xmlInitThreads() doesn't do anything as of the current libxml, but I'd not found such a description in the documentation that states xmlInitThreads() is reserved for future use..? Unless there is a way to inject it after the start-up of the Zend MM, this is the only spot I know of to get the initialization in there. Other than for consistancy is there any problem in having it initialize before the Zend MM? In compat.c, xmlMemSetup() is called with XML_ParserCreate_MM() to initialise the libxml MM so it would take advantage of Zend allocators (emalloc family) instead of the plain libc allocators. I know that's a kind of bogus stuff, but then how should we handle it? 1. statically initialise them in PHP_MINIT_FUNCTION() in advance of any call of XML_ParserCreateMM() at runtime and ignore the second parameter passed to XML_ParserCreateMM(). 2. use the libc allocators in any way. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/shmop shmop.dsp
edink Sun Jun 15 08:19:57 2003 EDT Modified files: /php4/ext/shmop shmop.dsp Log: Fixed win32 build Index: php4/ext/shmop/shmop.dsp diff -u php4/ext/shmop/shmop.dsp:1.1 php4/ext/shmop/shmop.dsp:1.2 --- php4/ext/shmop/shmop.dsp:1.1Tue Aug 7 09:33:27 2001 +++ php4/ext/shmop/shmop.dspSun Jun 15 08:19:57 2003 @@ -43,7 +43,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 SHMOP_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\\ /I ..\..\main /I ..\..\TSRM /I ..\..\ZEND /D ZEND_WIN32=1 /D PHP_WIN32=1 /D NDEBUG /D PHP_EXPORTS /D HAVE_SHMOP /D COMPILE_DL_SHMOP=1 /D ZEND_DEBUG=0 /D ZTS /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\\ /I ..\..\main /I ..\..\TSRM /I ..\..\ZEND /D WIN32 /D ZEND_WIN32=1 /D PHP_WIN32=1 /D NDEBUG /D PHP_EXPORTS /D HAVE_SHMOP /D COMPILE_DL_SHMOP=1 /D ZEND_DEBUG=0 /D ZTS /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d NDEBUG @@ -69,7 +69,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 SHMOP_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\\ /I ..\..\main /I ..\..\TSRM /I ..\..\ZEND /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D PHP_EXPORTS /D COMPILE_DL_SHMOP /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SHMOP=1 /D ZTS=1 /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\\ /I ..\..\main /I ..\..\TSRM /I ..\..\ZEND /D WIN32 /D ZEND_DEBUG=1 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D PHP_EXPORTS /D COMPILE_DL_SHMOP /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_SHMOP=1 /D ZTS=1 /YX /FD /GZ /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d _DEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
From: Moriyoshi Well, virtually xmlInitThreads() doesn't do anything as of the current libxml, but I'd not found such a description in the documentation that states xmlInitThreads() is reserved for future use..? There are discussions on the libxml mailing list about implementing functionality here. Dont have the links right now but I believe it was the beginning of May of this year when it started. It sounds like the majority of it is going to be done for the next major libxml version, but they are also talking about implementing some of it within the 2.5 branch. Nothing is set in stone here, so I cant definitively say how or when it will actually be implemented. In compat.c, xmlMemSetup() is called with XML_ParserCreate_MM() to initialise the libxml MM so it would take advantage of Zend allocators (emalloc family) instead of the plain libc allocators. I know that's a kind of bogus stuff, but then how should we handle it? 1. statically initialise them in PHP_MINIT_FUNCTION() in advance of any call of XML_ParserCreateMM() at runtime and ignore the second parameter passed to XML_ParserCreateMM(). 2. use the libc allocators in any way. You also need to remember that the xml extension is not the only extension using libxml. The is also dom, simplexml, xsl and possibly the old domxml extension. In order for everything to play nicely, it looks like you should be statically initializing them in the PHP_MINIT_FUNCTION. These are globals that are being changed which can affect all the other extensions using libxml. Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
Rob Richards [EMAIL PROTECTED] wrote: There are discussions on the libxml mailing list about implementing functionality here. Dont have the links right now but I believe it was the beginning of May of this year when it started. It sounds like the majority of it is going to be done for the next major libxml version, but they are also talking about implementing some of it within the 2.5 branch. Nothing is set in stone here, so I cant definitively say how or when it will actually be implemented. Thanks for the pointer. I'll try to find it. In compat.c, xmlMemSetup() is called with XML_ParserCreate_MM() to initialise the libxml MM so it would take advantage of Zend allocators (emalloc family) instead of the plain libc allocators. I know that's a kind of bogus stuff, but then how should we handle it? 1. statically initialise them in PHP_MINIT_FUNCTION() in advance of any call of XML_ParserCreateMM() at runtime and ignore the second parameter passed to XML_ParserCreateMM(). 2. use the libc allocators in any way. You also need to remember that the xml extension is not the only extension using libxml. The is also dom, simplexml, xsl and possibly the old domxml extension. In order for everything to play nicely, it looks like you should be statically initializing them in the PHP_MINIT_FUNCTION. These are globals that are being changed which can affect all the other extensions using libxml. Indeed. But as long as libxml allocators are designed to be initialised only in the xml extension, the order could be a problem in which those extensions are initialised on startup. Maybe I can make clones of the xmlMemSetup() code and paste them to the PHP_MINIT_FUNCTION() of every extension which uses libxml, but it hardly looks like a better solution. I'd asked you for more a practical option :) Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
From: Moriyoshi Koizumi Indeed. But as long as libxml allocators are designed to be initialised only in the xml extension, the order could be a problem in which those extensions are initialised on startup. Maybe I can make clones of the xmlMemSetup() code and paste them to the PHP_MINIT_FUNCTION() of every extension which uses libxml, but it hardly looks like a better solution. I'd asked you for more a practical option :) We had originally looked at implementing that xml_parser_inited stuff, but the way it was implemented was basically duplicating the same initialization code everywhere. What would be nice would to have a centralized function (it would have to live outside all the libxml based extensions that every extension could call on MINIT. It would be re-entrant safe to avoid corruption of globals. Then the extension could just call the function during its MINIT (as this would also make it extremely easy to change initialization routines to correspond with any changes in libxml or add any initialization that would need to take place). This probably does have some draw backs, but it would be ideal. Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dom dom.dsp
rrichards Sun Jun 15 10:50:11 2003 EDT Modified files: /php4/ext/dom dom.dsp Log: link libxml2 dynamically for consistancy Index: php4/ext/dom/dom.dsp diff -u php4/ext/dom/dom.dsp:1.1 php4/ext/dom/dom.dsp:1.2 --- php4/ext/dom/dom.dsp:1.1Thu Jun 5 13:06:52 2003 +++ php4/ext/dom/dom.dspSun Jun 15 10:50:11 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_DOM /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 DOM_EXPORTS /D COMPILE_DL_DOM /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOM=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 DOM_EXPORTS /D COMPILE_DL_DOM /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOM=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_dom.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 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 /machine:I386 /out:..\..\Release_TS/php_dom.dll /implib:..\..\Release_TS/php_dom.lib /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == dom - 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_DOM /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 DOM_EXPORTS /D COMPILE_DL_DOM /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOM=1 /D LIBXML_STATIC=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /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 DOM_EXPORTS /D COMPILE_DL_DOM /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOM=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 ws2_32.lib libxml2_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 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_dom.dll /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 php4ts_debug.lib ws2_32.lib libxml2.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 /nodefaultlib:msvcrt /out:..\..\Debug_TS\php_dom.dll /implib:..\..\Debug_TS/php_dom.lib /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xsl xsl.dsp
rrichards Sun Jun 15 10:52:23 2003 EDT Modified files: /php4/ext/xsl xsl.dsp Log: fix xsl release build link libxml2 and libxslt dynamically for consistancy Index: php4/ext/xsl/xsl.dsp diff -u php4/ext/xsl/xsl.dsp:1.1 php4/ext/xsl/xsl.dsp:1.2 --- php4/ext/xsl/xsl.dsp:1.1Thu Jun 5 13:10:13 2003 +++ php4/ext/xsl/xsl.dspSun Jun 15 10:52:23 2003 @@ -42,7 +42,7 @@ # PROP Intermediate_Dir Release_TS # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D XSL_EXPORTS /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D XSL_EXPORTS /YX /FD /c +# ADD CPP /nologo /MT /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 COMPILE_DL_XSL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /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 0x409 /d NDEBUG @@ -52,7 +52,8 @@ # 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 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 /implib:.Release_TS/xsl.lib /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release +# SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == xsl - Win32 Debug_TS @@ -68,7 +69,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 XSL_EXPORTS /YX /FD /GZ /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 XSL_EXPORTS /D COMPILE_DL_XSL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /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 XSL_EXPORTS /D COMPILE_DL_XSL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D LIBXML_THREAD_ENABLED=1 /FR /YX /FD /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d _DEBUG @@ -78,7 +79,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_a.lib libxslt_a.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 /libpath:..\domxml5\debug_ts +# 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 !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
Rob Richards [EMAIL PROTECTED] wrote: From: Moriyoshi Koizumi Indeed. But as long as libxml allocators are designed to be initialised only in the xml extension, the order could be a problem in which those extensions are initialised on startup. Maybe I can make clones of the xmlMemSetup() code and paste them to the PHP_MINIT_FUNCTION() of every extension which uses libxml, but it hardly looks like a better solution. I'd asked you for more a practical option :) We had originally looked at implementing that xml_parser_inited stuff, but the way it was implemented was basically duplicating the same initialization code everywhere. I wasn't aware of being the third person here.. What would be nice would to have a centralized function (it would have to live outside all the libxml based extensions that every extension could call on MINIT. It would be re-entrant safe to avoid corruption of globals. Then the extension could just call the function during its MINIT (as this would also make it extremely easy to change initialization routines to correspond with any changes in libxml or add any initialization that would need to take place). This probably does have some draw backs, but it would be ideal. It looks like we(?) need a functionality in TSRM similar to pthread_once(), with which we could make sure that the initialisation routine with an unique integer ID is called only once in the lifetime of the process. As for Win32, I think it's possible to emulate it with TLS stuff though the API doesn't provide a specific function dedicated to that functionality. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xsl xsl.dsp
rrichards Sun Jun 15 10:57:06 2003 EDT Modified files: /php4/ext/xsl xsl.dsp Log: be nice if i named the dll correctly and put it somewhere Index: php4/ext/xsl/xsl.dsp diff -u php4/ext/xsl/xsl.dsp:1.2 php4/ext/xsl/xsl.dsp:1.3 --- php4/ext/xsl/xsl.dsp:1.2Sun Jun 15 10:52:23 2003 +++ php4/ext/xsl/xsl.dspSun Jun 15 10:57:06 2003 @@ -40,6 +40,7 @@ # PROP Use_Debug_Libraries 0 # PROP Output_Dir Release_TS # PROP Intermediate_Dir Release_TS +# 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 XSL_EXPORTS /YX /FD /c # ADD CPP /nologo /MT /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 COMPILE_DL_XSL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D LIBXML_THREAD_ENABLED=1 /YX /FD /c @@ -52,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 /implib:.Release_TS/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 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/xsl.lib /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == xsl - Win32 Debug_TS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Sun Jun 15 11:16:18 2003 EDT Modified files: /CVSROOTavail Log: doc account for Yu Watanabe Index: CVSROOT/avail diff -u CVSROOT/avail:1.688 CVSROOT/avail:1.689 --- CVSROOT/avail:1.688 Thu Jun 12 15:43:15 2003 +++ CVSROOT/avail Sun Jun 15 11:16:18 2003 @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,tony2001,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon|phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el
[PHP-CVS] cvs: php4 /ext/gd gd.c
andrey Sun Jun 15 11:22:09 2003 EDT
Modified files:
/php4/ext/gdgd.c
Log:
proto fixes
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.272 php4/ext/gd/gd.c:1.273
--- php4/ext/gd/gd.c:1.272 Tue Jun 10 16:03:29 2003
+++ php4/ext/gd/gd.cSun Jun 15 11:22:09 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.272 2003/06/10 20:03:29 imajes Exp $ */
+/* $Id: gd.c,v 1.273 2003/06/15 15:22:09 andrey Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -742,7 +742,7 @@
}
/* }}} */
-/* {{{ proto void imagesetstyle(resource im, array styles)
+/* {{{ proto bool imagesetstyle(resource im, array styles)
Set the line drawing styles for use with imageline and IMG_COLOR_STYLED. */
PHP_FUNCTION(imagesetstyle)
{
@@ -786,7 +786,7 @@
/* }}} */
#if HAVE_LIBGD20
-/* {{{ proto int imagecreatetruecolor(int x_size, int y_size)
+/* {{{ proto resource imagecreatetruecolor(int x_size, int y_size)
Create a new true color image */
PHP_FUNCTION(imagecreatetruecolor)
{
@@ -811,7 +811,7 @@
}
/* }}} */
-/* {{{ proto int imageistruecolor(int im)
+/* {{{ proto bool imageistruecolor(resource im)
return true if the image uses truecolor */
PHP_FUNCTION(imageistruecolor)
{
@@ -851,7 +851,7 @@
/* }}} */
#if HAVE_GD_BUNDLED
-/* {{{ proto void imagecolormatch(resource im1, resource im2)
+/* {{{ proto bool imagecolormatch(resource im1, resource im2)
Makes the colors of the palette version of an image more closely match the true
color version */
PHP_FUNCTION(imagecolormatch)
{
@@ -887,7 +887,7 @@
/* }}} */
#endif
-/* {{{ proto void imagesetthickness(resource im, int thickness)
+/* {{{ proto bool imagesetthickness(resource im, int thickness)
Set line thickness for drawing lines, ellipses, rectangles, polygons etc. */
PHP_FUNCTION(imagesetthickness)
{
@@ -907,7 +907,7 @@
}
/* }}} */
-/* {{{ proto void imagefilledellipse(resource im, int cx, int cy, int w, int h, int
color)
+/* {{{ proto bool imagefilledellipse(resource im, int cx, int cy, int w, int h, int
color)
Draw an ellipse */
PHP_FUNCTION(imagefilledellipse)
{
@@ -932,7 +932,7 @@
}
/* }}} */
-/* {{{ proto int imagefilledarc(int im, int cx, int cy, int w, int h, int s, int e,
int col, int style)
+/* {{{ proto bool imagefilledarc(resource im, int cx, int cy, int w, int h, int s,
int e, int col, int style)
Draw a filled partial ellipse */
PHP_FUNCTION(imagefilledarc)
{
@@ -971,7 +971,7 @@
}
/* }}} */
-/* {{{ proto void imagealphablending(resource im, bool on)
+/* {{{ proto bool imagealphablending(resource im, bool on)
Turn alpha blending mode on or off for the given image */
PHP_FUNCTION(imagealphablending)
{
@@ -992,7 +992,7 @@
/* }}} */
#if HAVE_LIBGD20
-/* {{{ proto void imagesavealpha(resource im, bool on)
+/* {{{ proto bool imagesavealpha(resource im, bool on)
Include alpha channel to a saved image */
PHP_FUNCTION(imagesavealpha)
{
@@ -1013,7 +1013,7 @@
#endif
#if HAVE_GD_BUNDLED
-/* {{{ proto void imagelayereffect(resource im, int effect)
+/* {{{ proto bool imagelayereffect(resource im, int effect)
Set the alpha blending flag to use the bundled libgd layering effects */
PHP_FUNCTION(imagelayereffect)
{
@@ -1118,7 +1118,7 @@
}
/* }}} */
-/* {{{ proto int imagecopyresampled(int dst_im, int src_im, int dst_x, int dst_y, int
src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h)
+/* {{{ proto bool imagecopyresampled(resource dst_im, resource src_im, int dst_x, int
dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h)
Copy and resize part of an image using resampling to help ensure clarity */
PHP_FUNCTION(imagecopyresampled)
{
@@ -1159,7 +1159,7 @@
#endif
#ifdef HAVE_GD_BUNDLED
-/* {{{ proto int imagerotate(int src_im, float angle, int bgdcolor)
+/* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor)
Rotate an image using a custom angle */
PHP_FUNCTION(imagerotate)
{
@@ -1191,7 +1191,7 @@
#endif
#if HAVE_GD_IMAGESETTILE
-/* {{{ proto int imagesettile(resource image, resource tile)
+/* {{{ proto bool imagesettile(resource image, resource tile)
Set the tile image to $tile when filling $image with the IMG_COLOR_TILED color */
PHP_FUNCTION(imagesettile)
{
@@ -1213,7 +1213,7 @@
#endif
#if HAVE_GD_IMAGESETBRUSH
-/* {{{ proto int imagesetbrush(resource image, resource brush)
+/* {{{ proto bool imagesetbrush(resource image, resource brush)
Set the brush image to $brush when filling $image with the IMG_COLOR_BRUSHED
color */
PHP_FUNCTION(imagesetbrush)
{
@@ -1234,7 +1234,7 @@
/* }}} */
#endif
-/* {{{ proto int imagecreate(int x_size, int y_size)
+/* {{{ proto resource imagecreate(int x_size, int y_size)
Create a new image */
PHP_FUNCTION(imagecreate)
{
@@ -1369,7 +1369,7 @@
}
/* }}} */
-/* {{{ proto int
[PHP-CVS] cvs: php4 /ext/fdf fdf.c
andrey Sun Jun 15 11:23:53 2003 EDT
Modified files:
/php4/ext/fdf fdf.c
Log:
proto fixes
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.81 php4/ext/fdf/fdf.c:1.82
--- php4/ext/fdf/fdf.c:1.81 Tue Jun 10 16:03:28 2003
+++ php4/ext/fdf/fdf.c Sun Jun 15 11:23:53 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fdf.c,v 1.81 2003/06/10 20:03:28 imajes Exp $ */
+/* $Id: fdf.c,v 1.82 2003/06/15 15:23:53 andrey Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -309,7 +309,7 @@
}
/* }}} */
-/* {{{ proto bool fdf_close(resource fdfdoc)
+/* {{{ proto void fdf_close(resource fdfdoc)
Closes the FDF document */
PHP_FUNCTION(fdf_close)
{
@@ -777,7 +777,7 @@
}
/* }}} */
-/* {{{ proto mixed fdf_save(resource fdfdoc [, string filename])
+/* {{{ proto bool fdf_save(resource fdfdoc [, string filename])
Writes out the FDF file */
PHP_FUNCTION(fdf_save)
{
@@ -834,7 +834,7 @@
}
/* }}} */
-/* {{{ proto mixed fdf_save_string(resource fdfdoc)
+/* {{{ proto string fdf_save_string(resource fdfdoc)
Returns the FDF file as a string */
PHP_FUNCTION(fdf_save_string)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/ftp php_ftp.c
andrey Sun Jun 15 11:24:24 2003 EDT
Modified files:
/php4/ext/ftp php_ftp.c
Log:
proto fixes
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.89 php4/ext/ftp/php_ftp.c:1.90
--- php4/ext/ftp/php_ftp.c:1.89 Tue Jun 10 16:03:29 2003
+++ php4/ext/ftp/php_ftp.c Sun Jun 15 11:24:24 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.89 2003/06/10 20:03:29 imajes Exp $ */
+/* $Id: php_ftp.c,v 1.90 2003/06/15 15:24:24 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -554,7 +554,7 @@
}
/* }}} */
-/* {{{ proto bool ftp_nb_fget(resource stream, resource fp, string remote_file, int
mode[, int resumepos])
+/* {{{ proto int ftp_nb_fget(resource stream, resource fp, string remote_file, int
mode[, int resumepos])
Retrieves a file from the FTP server asynchronly and writes it to an open file */
PHP_FUNCTION(ftp_nb_fget)
{
@@ -831,7 +831,7 @@
}
/* }}} */
-/* {{{ proto bool ftp_nb_fput(resource stream, string remote_file, resource fp, int
mode[, int startpos])
+/* {{{ proto int ftp_nb_fput(resource stream, string remote_file, resource fp, int
mode[, int startpos])
Stores a file from an open file to the FTP server nbronly */
PHP_FUNCTION(ftp_nb_fput)
{
@@ -936,7 +936,7 @@
/* }}} */
-/* {{{ proto bool ftp_nb_put(resource stream, string remote_file, string local_file,
int mode[, int startpos])
+/* {{{ proto int ftp_nb_put(resource stream, string remote_file, string local_file,
int mode[, int startpos])
Stores a file on the FTP server */
PHP_FUNCTION(ftp_nb_put)
{
@@ -1110,7 +1110,7 @@
}
/* }}} */
-/* {{{ proto void ftp_close(resource stream)
+/* {{{ proto bool ftp_close(resource stream)
Closes the FTP stream */
PHP_FUNCTION(ftp_close)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/fbsql php_fbsql.c
andrey Sun Jun 15 11:27:13 2003 EDT
Modified files:
/php4/ext/fbsql php_fbsql.c
Log:
proto fixes
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.97 php4/ext/fbsql/php_fbsql.c:1.98
--- php4/ext/fbsql/php_fbsql.c:1.97 Fri Jun 13 23:33:55 2003
+++ php4/ext/fbsql/php_fbsql.c Sun Jun 15 11:27:13 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.c,v 1.97 2003/06/14 03:33:55 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.98 2003/06/15 15:27:13 andrey Exp $ */
/* TODO:
*
@@ -666,7 +666,7 @@
}
/* }}} */
-/* {{{ proto int fbsql_close([resource link_identifier])
+/* {{{ proto bool fbsql_close([resource link_identifier])
Close a connection to a database server */
PHP_FUNCTION(fbsql_close)
{
@@ -907,7 +907,7 @@
}
/* }}} */
-/* {{{ proto int fbsql_rollback([resource link_identifier])
+/* {{{ proto bool fbsql_rollback([resource link_identifier])
Rollback all statments since last commit */
PHP_FUNCTION(fbsql_rollback)
{
@@ -1135,7 +1135,7 @@
RETURN_LONG(fbcbhBlobSize((FBCBlobHandle *)Z_STRVAL_PP(lob_handle)));
}
-/* {{{ proto string fbsql_blob_size(string blob_handle [, resource link_identifier])
+/* {{{ proto int fbsql_blob_size(string blob_handle [, resource link_identifier])
Get the size of a BLOB identified by blob_handle */
PHP_FUNCTION(fbsql_blob_size)
{
@@ -1143,7 +1143,7 @@
}
/* }}} */
-/* {{{ proto string fbsql_clob_size(string clob_handle [, resource link_identifier])
+/* {{{ proto int fbsql_clob_size(string clob_handle [, resource link_identifier])
Get the size of a CLOB identified by clob_handle */
PHP_FUNCTION(fbsql_clob_size)
{
@@ -2597,7 +2597,7 @@
}
/* }}} */
-/* {{{ proto int fbsql_next_result(int result)
+/* {{{ proto bool fbsql_next_result(int result)
Switch to the next result if multiple results are available */
PHP_FUNCTION(fbsql_next_result)
{
@@ -2953,7 +2953,7 @@
result-columnIndex = 0;
}
-/* {{{ proto int fbsql_data_seek(int result, int row_number)
+/* {{{ proto bool fbsql_data_seek(int result, int row_number)
Move the internal row counter to the specified row_number */
PHP_FUNCTION(fbsql_data_seek)
{
@@ -3211,7 +3211,7 @@
}
/* }}} */
-/* {{{ proto string fbsql_field_len(int result [, int field_index])
+/* {{{ proto mixed fbsql_field_len(int result [, int field_index])
Get the column length for a specified field_index */
PHP_FUNCTION(fbsql_field_len)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/fam fam.c
andrey Sun Jun 15 11:27:45 2003 EDT
Modified files:
/php4/ext/fam fam.c
Log:
proto fixes
Index: php4/ext/fam/fam.c
diff -u php4/ext/fam/fam.c:1.4 php4/ext/fam/fam.c:1.5
--- php4/ext/fam/fam.c:1.4 Tue Jun 10 16:03:28 2003
+++ php4/ext/fam/fam.c Sun Jun 15 11:27:45 2003
@@ -15,7 +15,7 @@
| Author: Sascha Schumann [EMAIL PROTECTED] |
+--+
- $Id: fam.c,v 1.4 2003/06/10 20:03:28 imajes Exp $
+ $Id: fam.c,v 1.5 2003/06/15 15:27:45 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -182,7 +182,7 @@
/* }}} */
-/* {{{ proto int fam_open([string appname])
+/* {{{ proto resource fam_open([string appname])
*/
PHP_FUNCTION(fam_open)
{
@@ -207,7 +207,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_close(resource id)
+/* {{{ proto void fam_close(resource id)
*/
PHP_FUNCTION(fam_close)
{
@@ -221,7 +221,7 @@
}
/* }}} */
-/* {{{ proto int fam_monitor_directory(resource id, string dirname)
+/* {{{ proto resource fam_monitor_directory(resource id, string dirname)
*/
PHP_FUNCTION(fam_monitor_directory)
{
@@ -249,7 +249,7 @@
}
/* }}} */
-/* {{{ proto int fam_monitor_file(resource id, string filename)
+/* {{{ proto resource fam_monitor_file(resource id, string filename)
*/
PHP_FUNCTION(fam_monitor_file)
{
@@ -277,7 +277,7 @@
}
/* }}} */
-/* {{{ proto int fam_monitor_collection(resource id, string dirname, int depth,
string mask)
+/* {{{ proto resource fam_monitor_collection(resource id, string dirname, int depth,
string mask)
*/
PHP_FUNCTION(fam_monitor_collection)
{
@@ -309,7 +309,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_suspend_monitor(resource id, resource monitor_id)
+/* {{{ proto bool fam_suspend_monitor(resource id, resource monitor_id)
*/
PHP_FUNCTION(fam_suspend_monitor)
{
@@ -333,7 +333,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_resume_monitor(resource id, resource monitor_id)
+/* {{{ proto bool fam_resume_monitor(resource id, resource monitor_id)
*/
PHP_FUNCTION(fam_resume_monitor)
{
@@ -358,7 +358,7 @@
}
/* }}} */
-/* {{{ proto boolean fam_cancel_monitor(resource id, resource monitor_id)
+/* {{{ proto bool fam_cancel_monitor(resource id, resource monitor_id)
*/
PHP_FUNCTION(fam_cancel_monitor)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/exif exif.c
andrey Sun Jun 15 11:28:50 2003 EDT
Modified files:
/php4/ext/exif exif.c
Log:
proto fixes
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.149 php4/ext/exif/exif.c:1.150
--- php4/ext/exif/exif.c:1.149 Tue Jun 10 16:03:28 2003
+++ php4/ext/exif/exif.cSun Jun 15 11:28:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.149 2003/06/10 20:03:28 imajes Exp $ */
+/* $Id: exif.c,v 1.150 2003/06/15 15:28:50 andrey Exp $ */
/* ToDos
*
@@ -99,7 +99,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.149 2003/06/10 20:03:28 imajes Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.150 2003/06/15 15:28:50 andrey Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -2218,7 +2218,7 @@
#endif
/* }}} */
-/* {{{ proto string|false exif_tagname(index)
+/* {{{ proto string exif_tagname(index)
Get headername for index or false if not defined */
PHP_FUNCTION(exif_tagname)
{
@@ -3722,7 +3722,7 @@
}
/* }}} */
-/* {{{ proto array|false exif_read_data(string filename [, sections_needed [,
sub_arrays[, read_thumbnail]]])
+/* {{{ proto array exif_read_data(string filename [, sections_needed [, sub_arrays[,
read_thumbnail]]])
Reads header data from the JPEG/TIFF image filename and optionally reads the
internal thumbnails */
PHP_FUNCTION(exif_read_data)
{
@@ -3913,7 +3913,7 @@
}
/* }}} */
-/* {{{ proto string|false exif_thumbnail(string filename [, width, height [,
imagetype]])
+/* {{{ proto string exif_thumbnail(string filename [, width, height [, imagetype]])
Reads the embedded thumbnail */
PHP_FUNCTION(exif_thumbnail)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dbx dbx.c
andrey Sun Jun 15 11:29:46 2003 EDT
Modified files:
/php4/ext/dbx dbx.c
Log:
proto fixes
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.49 php4/ext/dbx/dbx.c:1.50
--- php4/ext/dbx/dbx.c:1.49 Tue Jun 10 16:03:27 2003
+++ php4/ext/dbx/dbx.c Sun Jun 15 11:29:46 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: dbx.c,v 1.49 2003/06/10 20:03:27 imajes Exp $ */
+/* $Id: dbx.c,v 1.50 2003/06/15 15:29:46 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -310,7 +310,7 @@
}
/* }}} */
-/* {{{ proto bool dbx_close(dbx_link_object dbx_link)
+/* {{{ proto int dbx_close(dbx_link_object dbx_link)
Returns success or failure
*/
ZEND_FUNCTION(dbx_close)
@@ -515,7 +515,7 @@
}
/* }}} */
-/* {{{ proto void dbx_error(dbx_link_object dbx_link)
+/* {{{ proto string dbx_error(dbx_link_object dbx_link)
Returns success or failure
*/
ZEND_FUNCTION(dbx_error)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
Sorry, for some damn reason I keep thinking Sterling had put in the stuff (though he told me yesterday it was you). From: Moriyoshi Koizumi It looks like we(?) need a functionality in TSRM similar to pthread_once(), with which we could make sure that the initialisation routine with an unique integer ID is called only once in the lifetime of the process. As for Win32, I think it's possible to emulate it with TLS stuff though the API doesn't provide a specific function dedicated to that functionality. Looks pretty much pretty much how it is done in libxml (xmlGetGlobalState). Will this cause any problems mandating the memory behavor in /etc/xml? Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
Rob Richards [EMAIL PROTECTED] wrote: Looks pretty much pretty much how it is done in libxml (xmlGetGlobalState). Will this cause any problems mandating the memory behavor in /etc/xml? As far as I looked over the libxml code, xmlMemSetup doesn't work in sync with the other part of the library as it seems to take it for granted that xmlMemSetup() is called prior to any libxml initialisation routines. That's why I'm under the impression that it's our task to to do it in the PHP side. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/hwapi hwapi.cpp
andrey Sun Jun 15 12:04:27 2003 EDT
Modified files:
/php4/ext/hwapi hwapi.cpp
Log:
proto fixes
Index: php4/ext/hwapi/hwapi.cpp
diff -u php4/ext/hwapi/hwapi.cpp:1.9 php4/ext/hwapi/hwapi.cpp:1.10
--- php4/ext/hwapi/hwapi.cpp:1.9Tue Jun 10 16:03:29 2003
+++ php4/ext/hwapi/hwapi.cppSun Jun 15 12:04:26 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hwapi.cpp,v 1.9 2003/06/10 20:03:29 imajes Exp $ */
+/* $Id: hwapi.cpp,v 1.10 2003/06/15 16:04:26 andrey Exp $ */
#include stdlib.h
#include errno.h
@@ -2238,7 +2238,7 @@
php_info_print_table_end();
}
-/* {{{ proto string hwapi_dummy(int link, int id, int msgid)
+/* {{{ proto bool hwapi_dummy(int link, int id, int msgid)
Hyperwave dummy function */
PHP_FUNCTION(hwapi_dummy) {
pval **arg1, **arg2, **arg3;
@@ -2248,7 +2248,7 @@
}
/* }}} */
-/* {{{ proto void hwapi_init(string hostname, int port)
+/* {{{ proto bool hwapi_init(string hostname, int port)
Hyperwave initialisation */
PHP_FUNCTION(hwapi_init) {
zval **argv[2], *id;
@@ -2296,7 +2296,7 @@
/* }}} */
/* {{{ proto string hwapi_hgcsp(string hostname, int port)
- Hyperwave dummy function */
+*/
PHP_FUNCTION(hwapi_hgcsp) {
zval **argv[2];
HW_API_HGCSP *db;
@@ -2329,7 +2329,7 @@
/* }}} */
/* {{{ proto object hwapi_object(array object_in)
- Hyperwave dummy function */
+*/
PHP_FUNCTION(hwapi_object) {
pval **arg1, *rv, *id;
HW_API_Object *newobj;
@@ -2375,8 +2375,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_mychildren(array parameters)
- Hyperwave dummy function */
+/* {{{ proto array hwapi_mychildren(string parameters)
+*/
PHP_FUNCTION(hwapi_mychildren) {
zval **arg1, *id, *rv;
HW_API_ObjectArray objarr;
@@ -2433,8 +2433,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_children(array parameters)
- Hyperwave dummy function */
+/* {{{ proto object hwapi_children(array parameters)
+ */
PHP_FUNCTION(hwapi_children) {
zval **arg1, *id, *rv;
HW_API_ObjectArray objarr;
@@ -2474,8 +2474,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_parents(string hostname, int port)
- Hyperwave dummy function */
+/* {{{ proto object hwapi_parents(array parameters)
+*/
PHP_FUNCTION(hwapi_parents) {
zval **arg1, *id, *rv;
HW_API_ObjectArray objarr;
@@ -2515,7 +2515,7 @@
}
/* }}} */
-/* {{{ proto string hwapi_find(array parameters)
+/* {{{ proto array hwapi_find(array parameters)
Finds objects */
PHP_FUNCTION(hwapi_find) {
zval **arg1, *id, *rv;
@@ -2567,7 +2567,7 @@
}
/* }}} */
-/* {{{ proto string hwapi_identify(string hostname, int port)
+/* {{{ proto bool hwapi_identify(array parameters)
Hyperwave dummy function */
PHP_FUNCTION(hwapi_identify) {
pval **arg1, *id, *rv;
@@ -2605,7 +2605,7 @@
}
/* }}} */
-/* {{{ proto string hwapi_remove(array parameters)
+/* {{{ proto bool hwapi_remove(array parameters)
Remove an object */
PHP_FUNCTION(hwapi_remove) {
pval **arg1, *id, *rv;
@@ -2643,7 +2643,7 @@
}
/* }}} */
-/* {{{ proto string hwapi_content(string hostname, int port)
+/* {{{ proto object hwapi_content(array parameters)
Retrieve content of object */
PHP_FUNCTION(hwapi_content) {
pval **arg1, *id, *rv;
@@ -2680,8 +2680,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_copy(array parameters)
- Hyperwave dummy function */
+/* {{{ proto object hwapi_copy(array parameters)
+*/
PHP_FUNCTION(hwapi_copy) {
pval **arg1, *id, *rv;
HW_API_copy_In *in;
@@ -2719,7 +2719,7 @@
}
/* }}} */
-/* {{{ proto string hwapi_link(array parameters)
+/* {{{ proto bool hwapi_link(array parameters)
Hyperwave dummy function */
PHP_FUNCTION(hwapi_link) {
pval **arg1, *id, *rv;
@@ -2757,8 +2757,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_move(array parameters)
- Hyperwave dummy function */
+/* {{{ proto bool hwapi_move(array parameters)
+*/
PHP_FUNCTION(hwapi_move) {
pval **arg1, *id, *rv;
HW_API_move_In *in;
@@ -2795,8 +2795,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_lock(array parameters)
- Hyperwave dummy function */
+/* {{{ proto bool hwapi_lock(array parameters)
+*/
PHP_FUNCTION(hwapi_lock) {
pval **arg1, *id, *rv;
HW_API_lock_In *in;
@@ -2833,8 +2833,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_unlock(array parameters)
- Hyperwave dummy function */
+/* {{{ proto bool hwapi_unlock(array parameters)
+*/
PHP_FUNCTION(hwapi_unlock) {
pval **arg1, *id, *rv;
HW_API_unlock_In *in;
@@ -2871,8 +2871,8 @@
}
/* }}} */
-/* {{{ proto string hwapi_replace(array parameters)
- Hyperwave dummy function */
+/* {{{ proto object hwapi_replace(array parameters)
+*/
PHP_FUNCTION(hwapi_replace) {
pval **arg1, *id, *rv;
HW_API_replace_In *in;
@@ -2908,8 +2908,8 @@
}
/* }}} */
-/* {{{ proto
[PHP-CVS] cvs: php4 /ext/hyperwave hw.c
andrey Sun Jun 15 12:25:58 2003 EDT
Modified files:
/php4/ext/hyperwave hw.c
Log:
proto fixes
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.122 php4/ext/hyperwave/hw.c:1.123
--- php4/ext/hyperwave/hw.c:1.122 Tue Jun 10 16:03:29 2003
+++ php4/ext/hyperwave/hw.c Sun Jun 15 12:25:58 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hw.c,v 1.122 2003/06/10 20:03:29 imajes Exp $ */
+/* $Id: hw.c,v 1.123 2003/06/15 16:25:58 andrey Exp $ */
#include stdlib.h
#include errno.h
@@ -962,7 +962,7 @@
/* Start of user level functions */
/* * */
-/* {{{ proto int hw_connect(string host, int port [string username [, string
password]])
+/* {{{ proto resource hw_connect(string host, int port [, string username [, string
password]])
Connect to the Hyperwave server */
PHP_FUNCTION(hw_connect)
{
@@ -970,7 +970,7 @@
}
/* }}} */
-/* {{{ proto int hw_pconnect(string host, int port [, string username [, string
password]])
+/* {{{ proto resource hw_pconnect(string host, int port [, string username [, string
password]])
Connect to the Hyperwave server persistent */
PHP_FUNCTION(hw_pconnect)
{
@@ -978,7 +978,7 @@
}
/* }}} */
-/* {{{ proto void hw_close(int link)
+/* {{{ proto bool hw_close(resource link)
Close connection to Hyperwave server */
PHP_FUNCTION(hw_close)
{
@@ -995,7 +995,7 @@
}
/* }}} */
-/* {{{ proto void hw_info(int link)
+/* {{{ proto bool hw_info(resource link)
Outputs info string */
PHP_FUNCTION(hw_info)
{
@@ -1022,7 +1022,7 @@
}
/* }}} */
-/* {{{ proto int hw_error(int link)
+/* {{{ proto int hw_error(resource link)
Returns last error number */
PHP_FUNCTION(hw_error)
{
@@ -1038,7 +1038,7 @@
}
/* }}} */
-/* {{{ proto string hw_errormsg(int link)
+/* {{{ proto string hw_errormsg(resource link)
Returns last error message */
PHP_FUNCTION(hw_errormsg)
{
@@ -1355,7 +1355,7 @@
}
/* }}} */
-/* {{{ proto string hw_stat(int link)
+/* {{{ proto string hw_stat(resource link)
Returns status string */
PHP_FUNCTION(hw_stat)
{
@@ -1371,7 +1371,7 @@
}
/* }}} */
-/* {{{ proto array hw_who(int link)
+/* {{{ proto array hw_who(resource link)
Returns names and info of users loged in */
PHP_FUNCTION(hw_who)
{
@@ -1482,7 +1482,7 @@
}
/* }}} */
-/* {{{ proto string hw_dummy(int link, int id, int msgid)
+/* {{{ proto string hw_dummy(resource link, int id, int msgid)
Hyperwave dummy function */
PHP_FUNCTION(hw_dummy)
{
@@ -1513,7 +1513,7 @@
}
/* }}} */
-/* {{{ proto string hw_getobject(int link, int objid [, string query])
+/* {{{ proto mixed hw_getobject(resource link, int objid [, string query])
Returns object record */
PHP_FUNCTION(hw_getobject)
{
@@ -1592,7 +1592,7 @@
}
/* }}} */
-/* {{{ proto int hw_insertobject(int link, string objrec, string parms)
+/* {{{ proto int hw_insertobject(resource link, string objrec, string parms)
Inserts an object */
PHP_FUNCTION(hw_insertobject)
{
@@ -1621,7 +1621,7 @@
}
/* }}} */
-/* {{{ proto string hw_getandlock(int link, int objid)
+/* {{{ proto string hw_getandlock(resource link, int objid)
Returns object record and locks object */
PHP_FUNCTION(hw_getandlock)
{
@@ -1647,7 +1647,7 @@
}
/* }}} */
-/* {{{ proto void hw_unlock(int link, int objid)
+/* {{{ proto bool hw_unlock(resource link, int objid)
Unlocks object */
PHP_FUNCTION(hw_unlock)
{
@@ -1670,7 +1670,7 @@
}
/* }}} */
-/* {{{ proto void hw_deleteobject(int link, int objid)
+/* {{{ proto bool hw_deleteobject(resource link, int objid)
Deletes object */
PHP_FUNCTION(hw_deleteobject)
{
@@ -1692,7 +1692,7 @@
}
/* }}} */
-/* {{{ proto void hw_changeobject(int link, int objid, array attributes)
+/* {{{ proto bool hw_changeobject(resource link, int objid, array attributes)
Changes attributes of an object (obsolete) */
#define BUFFERLEN 200
PHP_FUNCTION(hw_changeobject)
@@ -1776,7 +1776,7 @@
#undef BUFFERLEN
/* }}} */
-/* {{{ proto void hw_modifyobject(int link, int objid, array remattributes, array
addattributes [, int mode])
+/* {{{ proto bool hw_modifyobject(resource link, int objid, array remattributes,
array addattributes [, int mode])
Modifies attributes of an object */
#define BUFFERLEN 200
PHP_FUNCTION(hw_modifyobject)
@@ -2088,7 +2088,7 @@
}
/* }}} */
-/* {{{ proto void hw_mv(int link, array objrec, int from, int dest)
+/* {{{ proto int hw_mv(resource link, array objrec, int from, int dest)
Moves object */
PHP_FUNCTION(hw_mv)
{
@@ -2096,7 +2096,7 @@
}
/* }}} */
-/* {{{ proto void hw_cp(int link, array objrec, int dest)
+/* {{{ proto int hw_cp(resource link, array objrec, int dest)
Copies object */
PHP_FUNCTION(hw_cp)
{
@@ -2104,7 +2104,7 @@
}
/* }}} */
-/* {{{ proto hwdoc hw_gettext(int link, int objid [, int rootid])
+/* {{{ proto int hw_gettext(resource link, int objid [, int rootid])
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
- Original Message - From: Moriyoshi Koizumi Looks pretty much pretty much how it is done in libxml (xmlGetGlobalState). Will this cause any problems mandating the memory behavor in /etc/xml? As far as I looked over the libxml code, xmlMemSetup doesn't work in sync with the other part of the library as it seems to take it for granted that xmlMemSetup() is called prior to any libxml initialisation routines. That's why I'm under the impression that it's our task to to do it in the PHP side. If you want to override the memory handling, i.e. currently it uses free/malloc/realloc/strdup, then yes it will need to be setup. And it has to be setup prior to xmlInitParser as the globals will be allocated via that particular memory handler. Another thing, if the memory handler is changed, I am not sure what the affect on trying to debug the libxml memory will be. This is very important as, at least working in dom, there are so many scenarios that can happen and it would take forever trying to fix leaks coming from libxml. any reason you want to change the memory handling? I would just think that it would be one more thing that we would have to deal with. What I meant about the xmlGetGlobalState was how it handle the one time initialzation under threading. Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
I think all memory handling should be done with PHP, as you can see there are many places in simplexml where I avoid a copy by relying on the fact that the libxml2 memory will be allocated by php's mm. -Sterling On Sun, 2003-06-15 at 13:04, Rob Richards wrote: - Original Message - From: Moriyoshi Koizumi Looks pretty much pretty much how it is done in libxml (xmlGetGlobalState). Will this cause any problems mandating the memory behavor in /etc/xml? As far as I looked over the libxml code, xmlMemSetup doesn't work in sync with the other part of the library as it seems to take it for granted that xmlMemSetup() is called prior to any libxml initialisation routines. That's why I'm under the impression that it's our task to to do it in the PHP side. If you want to override the memory handling, i.e. currently it uses free/malloc/realloc/strdup, then yes it will need to be setup. And it has to be setup prior to xmlInitParser as the globals will be allocated via that particular memory handler. Another thing, if the memory handler is changed, I am not sure what the affect on trying to debug the libxml memory will be. This is very important as, at least working in dom, there are so many scenarios that can happen and it would take forever trying to fix leaks coming from libxml. any reason you want to change the memory handling? I would just think that it would be one more thing that we would have to deal with. What I meant about the xmlGetGlobalState was how it handle the one time initialzation under threading. Rob -- C makes it easy to shoot yourself in the foot; C++ makes it harder, but when you do, it blows away your whole leg. - Bjarne Stroustrup -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
From: Sterling Hughes Right. I think just keeping this in ext/xml or ext/dom is fine. We don't really have any other systems for this atm. I would say xml extension as that usually is always built (though if someone decides they want expat, then there is a problem).. What happens though if the xml is not built? Will it be a prerequisite that the xml extension is built in order to build any of the other extensions? Then, do we even need to worry about re-entrance then? why so? So, we may define the same memory handling functions a few times. xmlInitParser is already re-entrant safe. That's fine, its just a function pointer assign. Didnt you answer your own question here? Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml xml.c
From: Moriyoshi Koizumi Right, for an even further concern, what if libxml was used in a portion of the entire process outside the PHP code..? (e.g. in a Apache module). If such collision could well happen, we'd be better off leaving it use the ordinary allocators. On the other hand, it should be worth paying attention to that circular references are big threats against reference count based garbage collection. As we have to handle memory allocations with great care in threaded servers, it'd be safer to use Zend's MM here. For now, why not remove the XML_Memory_Handling_Suite parameter from compat.c (as we already know it will would need to be handled in the MINIT) and just leave the xmlParserInit where it is. This will at least get everything closer no matter which direction we go (using Zend MM or libxml's standard). I really dont have any type of answer here. Damned if you do and damned if you dont. Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xsl xsl.dsp
rrichards Sun Jun 15 15:54:38 2003 EDT Modified files: /php4/ext/xsl xsl.dsp Log: should be multithreaded and correct lib naming Index: php4/ext/xsl/xsl.dsp diff -u php4/ext/xsl/xsl.dsp:1.3 php4/ext/xsl/xsl.dsp:1.4 --- php4/ext/xsl/xsl.dsp:1.3Sun Jun 15 10:57:06 2003 +++ php4/ext/xsl/xsl.dspSun Jun 15 15:54:38 2003 @@ -43,7 +43,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 XSL_EXPORTS /YX /FD /c -# ADD CPP /nologo /MT /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 COMPILE_DL_XSL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D LIBXML_THREAD_ENABLED=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 COMPILE_DL_XSL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /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 0x409 /d NDEBUG @@ -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/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 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 # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == xsl - Win32 Debug_TS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/tests conv_test.xbm
helly Sun Jun 15 15:56:40 2003 EDT
Modified files:
/php4/ext/gd/tests conv_test.xbm
Log:
Better use '_' instead of '.'
Index: php4/ext/gd/tests/conv_test.xbm
diff -u php4/ext/gd/tests/conv_test.xbm:1.1 php4/ext/gd/tests/conv_test.xbm:1.2
--- php4/ext/gd/tests/conv_test.xbm:1.1 Sat Feb 1 20:34:54 2003
+++ php4/ext/gd/tests/conv_test.xbm Sun Jun 15 15:56:40 2003
@@ -1,4 +1,4 @@
-#define conv_test.xbm_width 16
-#define conv_test.xbm_height 5
-static unsigned char conv_test.xbm_bits[] = {
+#define conv_test_xbm_width 16
+#define conv_test_xbm_height 5
+static unsigned char conv_test_xbm_bits[] = {
0x4c, 0x0d, 0x54, 0x15, 0xcc, 0x0d, 0x44, 0x05, 0x44, 0x05};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dom document.c element.c node.c php_dom.c php_dom.h text.c xml_common.h
rrichards Sun Jun 15 15:58:42 2003 EDT
Modified files:
/php4/ext/dom xml_common.h text.c php_dom.h php_dom.c node.c
element.c document.c
Log:
remove code no longer needed
fix format Output property
Index: php4/ext/dom/xml_common.h
diff -u php4/ext/dom/xml_common.h:1.7 php4/ext/dom/xml_common.h:1.8
--- php4/ext/dom/xml_common.h:1.7 Sat Jun 14 14:14:59 2003
+++ php4/ext/dom/xml_common.h Sun Jun 15 15:58:42 2003
@@ -17,31 +17,20 @@
+--+
*/
-/* $Id: xml_common.h,v 1.7 2003/06/14 18:14:59 rrichards Exp $ */
+/* $Id: xml_common.h,v 1.8 2003/06/15 19:58:42 rrichards Exp $ */
#ifndef PHP_XML_COMMON_H
-#define PHP_XML_COMMON_H
-
-typedef struct _node_list_pointer {
- xmlNodePtr nodep;
- void *next;
-} node_list_pointer;
-
-typedef struct _doc_ref_obj {
- void *ptr;
- int refcount;
-} doc_ref_obj;
+#define PHP_XML_COMMON_H
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;
+ dom_ref_obj *document;
} node_object;
typedef struct _dom_object {
Index: php4/ext/dom/text.c
diff -u php4/ext/dom/text.c:1.9 php4/ext/dom/text.c:1.10
--- php4/ext/dom/text.c:1.9 Thu Jun 12 13:04:28 2003
+++ php4/ext/dom/text.c Sun Jun 15 15:58:42 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: text.c,v 1.9 2003/06/12 17:04:28 rrichards Exp $ */
+/* $Id: text.c,v 1.10 2003/06/15 19:58:42 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -150,8 +150,6 @@
nnode-type = XML_ELEMENT_NODE;
xmlAddNextSibling(node, nnode);
nnode-type = XML_TEXT_NODE;
- } else {
- dom_add_to_list(nnode, intern TSRMLS_CC);
}
return_value = php_dom_create_object(nnode, ret, NULL, return_value, intern
TSRMLS_CC);
Index: php4/ext/dom/php_dom.h
diff -u php4/ext/dom/php_dom.h:1.4 php4/ext/dom/php_dom.h:1.5
--- php4/ext/dom/php_dom.h:1.4 Thu Jun 12 16:02:05 2003
+++ php4/ext/dom/php_dom.h Sun Jun 15 15:58:42 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.h,v 1.4 2003/06/12 20:02:05 rrichards Exp $ */
+/* $Id: php_dom.h,v 1.5 2003/06/15 19:58:42 rrichards Exp $ */
#ifndef PHP_DOM_H
#define PHP_DOM_H
@@ -61,9 +61,6 @@
void php_dom_throw_error(int error_code, zval **retval TSRMLS_DC);
void node_free_resource(xmlNodePtr node TSRMLS_DC);
void node_list_unlink(xmlNodePtr node TSRMLS_DC);
-void dom_del_from_list(xmlNodePtr nodep, dom_object *intern TSRMLS_DC);
-void dom_add_to_list(xmlNodePtr nodep, dom_object *intern TSRMLS_DC);
-void dom_clean_nodes(dom_object *object TSRMLS_DC);
int increment_document_reference(dom_object *object, xmlDocPtr docp TSRMLS_DC);
int decrement_document_reference(dom_object *object TSRMLS_DC);
xmlNsPtr dom_get_ns(char *uri, char *qName, int uri_len, int qName_len, int
*errorcode, char **localname);
Index: php4/ext/dom/php_dom.c
diff -u php4/ext/dom/php_dom.c:1.12 php4/ext/dom/php_dom.c:1.13
--- php4/ext/dom/php_dom.c:1.12 Sat Jun 14 14:14:59 2003
+++ php4/ext/dom/php_dom.c Sun Jun 15 15:58:42 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.12 2003/06/14 18:14:59 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.13 2003/06/15 19:58:42 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -85,7 +85,6 @@
object-document = emalloc(sizeof(dom_ref_obj));
object-document-ptr = docp;
object-document-refcount = 1;
- object-document-node_list = NULL;
}
return ret_refcount;
@@ -101,9 +100,6 @@
ret_refcount = object-document-refcount;
if (ret_refcount == 0) {
if (object-document-ptr != NULL) {
- dom_clean_nodes(object TSRMLS_CC);
- /* No references to Doc so can use xmlFreeDoc
- node_free_resource(object-document-ptr TSRMLS_CC); */
xmlFreeDoc((xmlDoc *) object-document-ptr);
object-document-ptr = NULL;
}
@@ -158,67 +154,12 @@
wrapper = dom_object_get_data(nodep);
if (wrapper != NULL ) {
- if (nodep-parent == NULL nodep-doc != NULL (xmlNodePtr)
nodep-doc != nodep) {
- dom_del_from_list(nodep, wrapper TSRMLS_CC);
- }
dom_object_set_data(nodep, NULL TSRMLS_CC);
php_dom_clear_object(wrapper TSRMLS_CC);
}
}
/* }}}
[PHP-CVS] cvs: php4 /ext/gd CREDITS
pajoye Sun Jun 15 16:16:46 2003 EDT Modified files: /php4/ext/gdCREDITS Log: add Marcus, enough work done Index: php4/ext/gd/CREDITS diff -u php4/ext/gd/CREDITS:1.2 php4/ext/gd/CREDITS:1.3 --- php4/ext/gd/CREDITS:1.2 Fri Feb 28 20:28:10 2003 +++ php4/ext/gd/CREDITS Sun Jun 15 16:16:46 2003 @@ -1,2 +1,2 @@ GD imaging -Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye +Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xml compat.c expat_compat.h
moriyoshi Sun Jun 15 16:40:45 2003 EDT
Modified files:
/php4/ext/xml compat.c expat_compat.h
Log:
Removed xmlMemSetup() code as it doesn't help at all.
Index: php4/ext/xml/compat.c
diff -u php4/ext/xml/compat.c:1.12 php4/ext/xml/compat.c:1.13
--- php4/ext/xml/compat.c:1.12 Tue Jun 10 16:03:40 2003
+++ php4/ext/xml/compat.c Sun Jun 15 16:40:45 2003
@@ -291,42 +291,18 @@
return XML_ParserCreate_MM(encoding, NULL, tmp);
}
-static void *(*_expat_cpt_malloc_fcn)(size_t sz);
-
-static char *_expat_cpt_intn_strdup(const char *str)
-{
- size_t len;
- char *retval;
-
- len = strlen(str);
- if ((retval = _expat_cpt_malloc_fcn(len + 1)) == NULL) {
- return NULL;
- }
- memcpy(retval, str, len + 1);
-
- return retval;
-}
-
XML_Parser
XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite
*memsuite, const XML_Char *sep)
{
XML_Parser parser;
- static XML_Memory_Handling_Suite mtemp_i = { malloc, realloc, free };
-
- if (memsuite == NULL) {
- memsuite = mtemp_i;
- }
-
- _expat_cpt_malloc_fcn = memsuite-malloc_fcn; /* FIXME: not reentrant ! */
-
- xmlMemSetup(memsuite-free_fcn, memsuite-malloc_fcn, memsuite-realloc_fcn,
_expat_cpt_intn_strdup); /* WHOCANFIXME: not reentrant ! */
- parser = (XML_Parser) memsuite-malloc_fcn(sizeof(struct _XML_Parser));
+ parser = (XML_Parser) emalloc(sizeof(struct _XML_Parser));
memset(parser, 0, sizeof(struct _XML_Parser));
parser-use_namespace = 0;
parser-mem_hdlrs = *memsuite;
parser-parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr)
php_xml_compat_handlers, (void *) parser, NULL, 0, NULL);
if (parser-parser == NULL) {
+ efree(parser);
return NULL;
}
if (encoding != NULL) {
@@ -572,7 +548,7 @@
xmlHashFree(parser-_reverse_ns_map, _free_ns_name);
}
xmlFreeParserCtxt(parser-parser);
- parser-mem_hdlrs.free_fcn(parser);
+ efree(parser);
}
#endif /* LIBXML_EXPAT_COMPAT */
Index: php4/ext/xml/expat_compat.h
diff -u php4/ext/xml/expat_compat.h:1.9 php4/ext/xml/expat_compat.h:1.10
--- php4/ext/xml/expat_compat.h:1.9 Tue Jun 10 16:03:40 2003
+++ php4/ext/xml/expat_compat.h Sun Jun 15 16:40:45 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: expat_compat.h,v 1.9 2003/06/10 20:03:40 imajes Exp $ */
+/* $Id: expat_compat.h,v 1.10 2003/06/15 20:40:45 moriyoshi Exp $ */
#ifndef PHP_EXPAT_COMPAT_H
#define PHP_EXPAT_COMPAT_H
@@ -57,8 +57,6 @@
void *user;
xmlParserCtxtPtr parser;
-
- XML_Memory_Handling_Suitemem_hdlrs;
XML_StartElementHandler h_start_element;
XML_EndElementHandlerh_end_element;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xml compat.c
rrichards Sun Jun 15 16:56:48 2003 EDT
Modified files:
/php4/ext/xml compat.c
Log:
remove leftover parser-mem_hdlrs - compiles now
Index: php4/ext/xml/compat.c
diff -u php4/ext/xml/compat.c:1.13 php4/ext/xml/compat.c:1.14
--- php4/ext/xml/compat.c:1.13 Sun Jun 15 16:40:45 2003
+++ php4/ext/xml/compat.c Sun Jun 15 16:56:48 2003
@@ -299,7 +299,6 @@
parser = (XML_Parser) emalloc(sizeof(struct _XML_Parser));
memset(parser, 0, sizeof(struct _XML_Parser));
parser-use_namespace = 0;
- parser-mem_hdlrs = *memsuite;
parser-parser = xmlCreatePushParserCtxt((xmlSAXHandlerPtr)
php_xml_compat_handlers, (void *) parser, NULL, 0, NULL);
if (parser-parser == NULL) {
efree(parser);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml compat.c
Thanks! I should have been running make before the commit.. Moriyoshi Rob Richards [EMAIL PROTECTED] wrote: rrichards Sun Jun 15 16:56:48 2003 EDT Modified files: /php4/ext/xml compat.c Log: remove leftover parser-mem_hdlrs - compiles now -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/exif exif.c exif.dsp
edink Sun Jun 15 18:58:04 2003 EDT
Modified files:
/php4/ext/exif exif.c exif.dsp
Log:
Fixed win32 build
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.150 php4/ext/exif/exif.c:1.151
--- php4/ext/exif/exif.c:1.150 Sun Jun 15 11:28:50 2003
+++ php4/ext/exif/exif.cSun Jun 15 18:58:03 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.150 2003/06/15 15:28:50 andrey Exp $ */
+/* $Id: exif.c,v 1.151 2003/06/15 22:58:03 edink Exp $ */
/* ToDos
*
@@ -99,7 +99,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.150 2003/06/15 15:28:50 andrey Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.151 2003/06/15 22:58:03 edink Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -134,7 +134,7 @@
/* {{{ PHP_INI
*/
-ZEND_API ZEND_INI_MH(OnUpdateEncode)
+ZEND_INI_MH(OnUpdateEncode)
{
#if EXIF_USE_MBSTRING
if (new_value strlen(new_value) !php_mb_check_encoding_list(new_value
TSRMLS_CC)) {
@@ -145,7 +145,7 @@
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2,
mh_arg3, stage TSRMLS_CC);
}
-ZEND_API ZEND_INI_MH(OnUpdateDecode)
+ZEND_INI_MH(OnUpdateDecode)
{
#if EXIF_USE_MBSTRING
if (!php_mb_check_encoding_list(new_value TSRMLS_CC)) {
Index: php4/ext/exif/exif.dsp
diff -u php4/ext/exif/exif.dsp:1.8 php4/ext/exif/exif.dsp:1.9
--- php4/ext/exif/exif.dsp:1.8 Mon Apr 15 18:23:20 2002
+++ php4/ext/exif/exif.dsp Sun Jun 15 18:58:04 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
..\..\..\bindlib_w32 /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D
_MBCS /D _USRDLL /D COMPILE_DL_EXIF /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I
..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D
_WINDOWS /D _MBCS /D _USRDLL /D EXIF_EXPORTS /D COMPILE_DL_EXIF /D ZTS=1 /D
ZEND_WIN32 /D PHP_WIN32 /D HAVE_EXIF=1 /D LIBZEND_EXPORTS /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I
..\..\..\bindlib_w32 /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D
_WINDOWS /D _MBCS /D _USRDLL /D EXIF_EXPORTS /D COMPILE_DL_EXIF /D ZTS=1 /D
ZEND_WIN32 /D PHP_WIN32 /D HAVE_EXIF=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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard file.h
edink Sun Jun 15 19:27:05 2003 EDT Modified files: /php4/ext/standard file.h Log: This needs to be exported for dynamic extensions Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.84 php4/ext/standard/file.h:1.85 --- php4/ext/standard/file.h:1.84 Tue Jun 10 16:03:37 2003 +++ php4/ext/standard/file.hSun Jun 15 19:27:05 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: file.h,v 1.84 2003/06/10 20:03:37 imajes Exp $ */ +/* $Id: file.h,v 1.85 2003/06/15 23:27:05 edink Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -116,7 +116,7 @@ #ifdef ZTS #define FG(v) TSRMG(file_globals_id, php_file_globals *, v) -extern int file_globals_id; +extern PHPAPI int file_globals_id; #else #define FG(v) (file_globals.v) extern php_file_globals file_globals; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/openssl openssl.dsp xp_ssl.c /main php_network.h /main/streams xp_socket.c
edink Sun Jun 15 19:34:46 2003 EDT Modified files: /php4/main php_network.h /php4/main/streams xp_socket.c /php4/ext/openssl xp_ssl.c openssl.dsp Log: Win32 build fixes for openssl Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.44 php4/main/php_network.h:1.45 --- php4/main/php_network.h:1.44Tue Jun 10 16:03:42 2003 +++ php4/main/php_network.h Sun Jun 15 19:34:45 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_network.h,v 1.44 2003/06/10 20:03:42 imajes Exp $ */ +/* $Id: php_network.h,v 1.45 2003/06/15 23:34:45 edink Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -165,7 +165,7 @@ size_t ownsize; }; typedef struct _php_netstream_data_t php_netstream_data_t; -extern php_stream_ops php_stream_socket_ops; +PHPAPI extern php_stream_ops php_stream_socket_ops; extern php_stream_ops php_stream_generic_socket_ops; #define PHP_STREAM_IS_SOCKET (php_stream_socket_ops) Index: php4/main/streams/xp_socket.c diff -u php4/main/streams/xp_socket.c:1.12 php4/main/streams/xp_socket.c:1.13 --- php4/main/streams/xp_socket.c:1.12 Tue Jun 10 16:03:42 2003 +++ php4/main/streams/xp_socket.c Sun Jun 15 19:34:45 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: xp_socket.c,v 1.12 2003/06/10 20:03:42 imajes Exp $ */ +/* $Id: xp_socket.c,v 1.13 2003/06/15 23:34:45 edink Exp $ */ #include php.h #include ext/standard/file.h @@ -32,7 +32,7 @@ #endif php_stream_ops php_stream_generic_socket_ops; -php_stream_ops php_stream_socket_ops; +PHPAPI php_stream_ops php_stream_socket_ops; php_stream_ops php_stream_udp_socket_ops; #ifdef AF_UNIX php_stream_ops php_stream_unix_socket_ops; Index: php4/ext/openssl/xp_ssl.c diff -u php4/ext/openssl/xp_ssl.c:1.7 php4/ext/openssl/xp_ssl.c:1.8 --- php4/ext/openssl/xp_ssl.c:1.7 Tue Jun 10 16:03:34 2003 +++ php4/ext/openssl/xp_ssl.c Sun Jun 15 19:34:46 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: xp_ssl.c,v 1.7 2003/06/10 20:03:34 imajes Exp $ */ +/* $Id: xp_ssl.c,v 1.8 2003/06/15 23:34:46 edink Exp $ */ #include php.h #include ext/standard/file.h @@ -507,7 +507,7 @@ }; -PHPAPI php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen, +php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen, char *resourcename, long resourcenamelen, const char *persistent_id, int options, int flags, struct timeval *timeout, Index: php4/ext/openssl/openssl.dsp diff -u php4/ext/openssl/openssl.dsp:1.2 php4/ext/openssl/openssl.dsp:1.3 --- php4/ext/openssl/openssl.dsp:1.2Mon Nov 11 11:11:28 2002 +++ php4/ext/openssl/openssl.dspSun Jun 15 19:34:46 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 php4ts.lib ssleay32.lib libeay32.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_openssl.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline +# ADD LINK32 php4ts.lib ssleay32.lib libeay32.lib ws2_32.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_openssl.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline !ELSEIF $(CFG) == openssl - Win32 Debug_TS @@ -79,7 +79,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 ssleay32.lib libeay32.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 /debug /machine:I386 /out:..\..\Debug_TS/php_openssl.dll /pdbtype:sept /libpath:..\..\Debug_TS +# ADD LINK32 php4ts_debug.lib ssleay32.lib libeay32.lib ws2_32.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 /debug /machine:I386 /out:..\..\Debug_TS/php_openssl.dll /pdbtype:sept /libpath:..\..\Debug_TS !ENDIF @@ -93,6 +93,10 @@ # Begin Source File SOURCE=.\openssl.c +# End Source File +# Begin Source File + +SOURCE=.\xp_ssl.c # End Source File # End Group # Begin Group Header Files -- PHP CVS Mailing List
[PHP-CVS] cvs: php4 /sapi/pi3web php4pi3web.dsp pi3web_sapi.c
edink Sun Jun 15 19:47:18 2003 EDT Modified files: /php4/sapi/pi3web php4pi3web.dsp pi3web_sapi.c Log: Fixed win32 build Index: php4/sapi/pi3web/php4pi3web.dsp diff -u php4/sapi/pi3web/php4pi3web.dsp:1.3 php4/sapi/pi3web/php4pi3web.dsp:1.4 --- php4/sapi/pi3web/php4pi3web.dsp:1.3 Sat Apr 19 12:11:36 2003 +++ php4/sapi/pi3web/php4pi3web.dsp Sun Jun 15 19:47:18 2003 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D php4pi3web_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ...\..\include /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\main /I ..\..\TSRM /D _DEBUG /D ZEND_DEBUG=1 /D _WINDOWS /D _USRDLL /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ...\..\include /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\main /I ..\..\TSRM /D _DEBUG /D ZEND_DEBUG=1 /D _WINDOWS /D _USRDLL /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /D PHP4PI3WEB_EXPORTS /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 @@ -70,7 +70,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 php4pi3web_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\main /I ..\..\TSRM /D NDEBUG /D ZEND_DEBUG=0 /D _WINDOWS /D _USRDLL /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ...\..\include /I ..\..\win32 /I ..\..\Zend /I ..\.. /I ..\..\main /I ..\..\TSRM /D NDEBUG /D ZEND_DEBUG=0 /D _WINDOWS /D _USRDLL /D ZTS /D ZEND_WIN32 /D PHP_WIN32 /D WIN32 /D _MBCS /D PHP4PI3WEB_EXPORTS /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 Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.54 php4/sapi/pi3web/pi3web_sapi.c:1.55 --- php4/sapi/pi3web/pi3web_sapi.c:1.54 Tue Jun 10 16:03:45 2003 +++ php4/sapi/pi3web/pi3web_sapi.c Sun Jun 15 19:47:18 2003 @@ -21,11 +21,10 @@ +--+ */ -/* $Id: pi3web_sapi.c,v 1.54 2003/06/10 20:03:45 imajes Exp $ */ +/* $Id: pi3web_sapi.c,v 1.55 2003/06/15 23:47:18 edink Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS -#include pi3web_sapi.h #include php.h #include php_main.h #include php_variables.h @@ -40,6 +39,8 @@ #include PiAPI.h #include Pi3API.h +#include pi3web_sapi.h + #define PI3WEB_SERVER_VAR_BUF_SIZE 1024 int IWasLoaded=0; @@ -78,7 +79,7 @@ PUTS(table border=0 cellpadding=3 cellspacing=1 width=600 align=center\n); PUTS(trth colspan=2 bgcolor=\ PHP_HEADER_COLOR \Pi3Web Server Information/th/tr\n); php_info_print_table_header(2, Information Field, Value); - php_info_print_table_row(2, Pi3Web SAPI module version, $Id: pi3web_sapi.c,v 1.54 2003/06/10 20:03:45 imajes Exp $); + php_info_print_table_row(2, Pi3Web SAPI module version, $Id: pi3web_sapi.c,v 1.55 2003/06/15 23:47:18 edink Exp $); php_info_print_table_row(2, Server Name Stamp, HTTPCore_getServerStamp()); snprintf(variable_buf, 511, %d, HTTPCore_debugEnabled()); php_info_print_table_row(2, Debug Enabled, variable_buf); -- 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
helly Sun Jun 15 19:57:48 2003 EDT
Modified files:
/php4/ext/dom php_dom.c
Log:
Add an error handler (thx to timm for the idea)
Index: php4/ext/dom/php_dom.c
diff -u php4/ext/dom/php_dom.c:1.13 php4/ext/dom/php_dom.c:1.14
--- php4/ext/dom/php_dom.c:1.13 Sun Jun 15 15:58:42 2003
+++ php4/ext/dom/php_dom.c Sun Jun 15 19:57:48 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.13 2003/06/15 19:58:42 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.14 2003/06/15 23:57:48 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -284,6 +284,20 @@
ZEND_GET_MODULE(dom)
#endif
+/* {{{ _phpXmlParserErrorCb */
+static void _phpXmlParserErrorCb(void *ctx, const char *msg, ...) {
+ va_list ap;
+ char *buf;
+ TSRMLS_FETCH();
+
+ va_start(ap, msg);
+ vspprintf(buf, 0, msg, ap);
+ va_end(ap);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, buf);
+ efree(buf);
+}
+/* }}} */
+
/* {{{ PHP_MINIT_FUNCTION(dom) */
PHP_MINIT_FUNCTION(dom)
{
@@ -520,6 +534,7 @@
REGISTER_LONG_CONSTANT(XML_ATTRIBUTE_NOTATION,
XML_ATTRIBUTE_NOTATION, CONST_CS | CONST_PERSISTENT);
xmlInitParser();
+ xmlSetGenericErrorFunc((void*) NULL, _phpXmlParserErrorCb);
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
helly Sun Jun 15 20:18:29 2003 EDT
Modified files:
/php4/ext/dom php_dom.c
Log:
Fit the error handler into the naming scheme and get rid of trailing new lines
Index: php4/ext/dom/php_dom.c
diff -u php4/ext/dom/php_dom.c:1.14 php4/ext/dom/php_dom.c:1.15
--- php4/ext/dom/php_dom.c:1.14 Sun Jun 15 19:57:48 2003
+++ php4/ext/dom/php_dom.c Sun Jun 15 20:18:28 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.14 2003/06/15 23:57:48 helly Exp $ */
+/* $Id: php_dom.c,v 1.15 2003/06/16 00:18:28 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -284,15 +284,21 @@
ZEND_GET_MODULE(dom)
#endif
-/* {{{ _phpXmlParserErrorCb */
-static void _phpXmlParserErrorCb(void *ctx, const char *msg, ...) {
+/* {{{ php_dom_error_func */
+static void php_dom_error_func(void *ctx, const char *msg, ...) {
va_list ap;
char *buf;
+ int len;
TSRMLS_FETCH();
va_start(ap, msg);
- vspprintf(buf, 0, msg, ap);
+ len = vspprintf(buf, 0, msg, ap);
va_end(ap);
+
+ /* remove any trailing \n */
+ while (len buf[--len] == '\n') {
+ buf[len] = '\0';
+ }
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, buf);
efree(buf);
}
@@ -534,7 +540,7 @@
REGISTER_LONG_CONSTANT(XML_ATTRIBUTE_NOTATION,
XML_ATTRIBUTE_NOTATION, CONST_CS | CONST_PERSISTENT);
xmlInitParser();
- xmlSetGenericErrorFunc((void*) NULL, _phpXmlParserErrorCb);
+ xmlSetGenericErrorFunc((void*) NULL, php_dom_error_func);
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Sun Jun 15 21:53:15 2003 EDT Modified files: /CVSROOTavail Log: pres2 karma for Sara Index: CVSROOT/avail diff -u CVSROOT/avail:1.689 CVSROOT/avail:1.690 --- CVSROOT/avail:1.689 Sun Jun 15 11:16:18 2003 +++ CVSROOT/avail Sun Jun 15 21:53:14 2003 @@ -36,7 +36,7 @@ # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -avail|sterling,jon,graeme,derick,imajes,wez,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques|pres,pres2,presentations +avail|sterling,jon,graeme,derick,imajes,wez,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita|pres,pres2,presentations # The PHP Quality Assurance Team maintains their own website. -- 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/hyperwave hg_comm.c hw.c
iliaa Sun Jun 15 23:07:07 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/hyperwave hg_comm.c hw.c
Log:
MFH: compiler warnings
Index: php4/ext/hyperwave/hg_comm.c
diff -u php4/ext/hyperwave/hg_comm.c:1.52.8.2 php4/ext/hyperwave/hg_comm.c:1.52.8.3
--- php4/ext/hyperwave/hg_comm.c:1.52.8.2 Thu Jun 5 19:48:16 2003
+++ php4/ext/hyperwave/hg_comm.cSun Jun 15 23:07:07 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hg_comm.c,v 1.52.8.2 2003/06/05 23:48:16 iliaa Exp $ */
+/* $Id: hg_comm.c,v 1.52.8.3 2003/06/16 03:07:07 iliaa Exp $ */
/* #define HW_DEBUG */
@@ -654,7 +654,7 @@
scriptname = emalloc(5*sizeof(char *));
if (zend_hash_find(EG(symbol_table), SCRIPT_NAME,
sizeof(SCRIPT_NAME), (void **) script_name)==FAILURE)
for(i=0; i5; i++)
- scriptname[i] = emptystring;
+ scriptname[i] = (char *) emptystring;
else {
convert_to_string_ex(script_name);
for(i=0; i5; i++)
@@ -684,7 +684,7 @@
newtext = text;
bgstr[0] = '\0';
#ifdef newlist
- zend_llist_sort(pAnchorList, fnCmpAnchors TSRMLS_CC);
+ zend_llist_sort(pAnchorList, (llist_compare_func_t) fnCmpAnchors TSRMLS_CC);
ptr = (ANCHOR **) zend_llist_get_last(pAnchorList);
if(ptr)
cur_ptr = *ptr;
@@ -1513,7 +1513,7 @@
return(comm_msg);
}
-int send_dummy(int sockfd, hw_objectID objectID, int msgid, char **attributes)
+int send_dummy(int sockfd, hw_objectID objectID, int msg_id, char **attributes)
{
hg_msg msg, *retmsg;
int length, error;
@@ -1521,7 +1521,7 @@
length = HEADER_LENGTH + sizeof(hw_objectID);
- build_msg_header(msg, length, msgid++, msgid);
+ build_msg_header(msg, length, msg_id++, msg_id);
if ( (msg.buf = (char *)emalloc(length-HEADER_LENGTH)) == NULL ) {
/* perror(send_command); */
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.111.2.3 php4/ext/hyperwave/hw.c:1.111.2.4
--- php4/ext/hyperwave/hw.c:1.111.2.3 Tue Mar 4 14:00:02 2003
+++ php4/ext/hyperwave/hw.c Sun Jun 15 23:07:07 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hw.c,v 1.111.2.3 2003/03/04 19:00:02 sniper Exp $ */
+/* $Id: hw.c,v 1.111.2.4 2003/06/16 03:07:07 iliaa Exp $ */
#include stdlib.h
#include errno.h
@@ -1512,7 +1512,7 @@
PHP_FUNCTION(hw_dummy)
{
pval **arg1, **arg2, **arg3;
- int link, id, type, msgid;
+ int link, id, type, msg_id;
hw_connection *ptr;
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, arg1, arg2, arg3) ==
FAILURE) {
@@ -1523,7 +1523,7 @@
convert_to_long_ex(arg3);
link=Z_LVAL_PP(arg1);
id=Z_LVAL_PP(arg2);
- msgid=Z_LVAL_PP(arg3);
+ msg_id=Z_LVAL_PP(arg3);
ptr = zend_list_find(link, type);
if(!ptr || (type!=le_socketp type!=le_psocketp)) {
php_error(E_WARNING, %s(): Unable to find file identifier %d,
get_active_function_name(TSRMLS_C), id);
@@ -1533,7 +1533,7 @@
set_swap(ptr-swap_on);
{
char *object = NULL;
- if (0 != (ptr-lasterror = send_dummy(ptr-socket, id, msgid, object)))
+ if (0 != (ptr-lasterror = send_dummy(ptr-socket, id, msg_id, object)))
RETURN_FALSE;
php_printf(%s, object);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
