Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:25300
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Message-ID: <44DB9EEA.7030309@ctindustries.net>
Date: Thu, 10 Aug 2006 17:02:34 -0400
User-Agent: Thunderbird 1.5.0.5 (Windows/20060719)
MIME-Version: 1.0
To: Edin Kadribasic <edink@emini.dk>,
   "internals@lists.php.net" <internals@lists.php.net>
Content-Type: multipart/mixed;
 boundary="------------040604030405070305050700"
Subject: libxml2/threading/win 2003
From: rrichards@ctindustries.net (Rob Richards)

--------------040604030405070305050700
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

In order to resolve reported crashing on win 2003, I have had to change 
the static libxml builds to use the flag LIBXML_STATIC_FOR_DLL.

This now requires a DllMain to be added within any dll that is building 
libxml2 in statically.
PHP 4.x - domxml (use php_domxml.c.diff.txt patch)
PHP 5.x/HEAD added within libxml.c (apply libxml.c.diff.txt to PHP 5 and 
HEAD - was made against HEAD)

This changes the threading a bit to work in the same manner as if 
libxml2 were built and linked to as a shared lib.

Along with these changes new libxml libraries are needed.
debug builds:
    http://ctindustries.net/libxml/libxml2-2.6.26.threads.zip
    http://ctindustries.net/libxml/libxslt-1.1.17.debug.php.zip

release builds:
    http://ctindustries.net/libxml/libxml2-2.6.26.threads.zip
    http://ctindustries.net/libxml/libxslt-1.1.17.php.zip

So far I have been testing these against 5.2 builds and ran a few tests 
with domxml in PHP 4.4 to make sure all was good. I would appreciate it 
if anyone running win builds make these changes to their local builds 
and let me know if anyone runs into any problems (there really shouldnt 
be any, but in any case..). Would like some additional outside testing 
before committing this stuff.

Rob





--------------040604030405070305050700
Content-Type: text/plain;
 name="libxml.c.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="libxml.c.diff.txt"

Index: libxml.c
===================================================================
RCS file: /repository/php-src/ext/libxml/libxml.c,v
retrieving revision 1.51
diff -u -r1.51 libxml.c
--- libxml.c	6 Aug 2006 17:41:39 -0000	1.51
+++ libxml.c	10 Aug 2006 20:25:31 -0000
@@ -1043,6 +1043,13 @@
 }
 /* }}} */
 
+#ifdef PHP_WIN32
+PHP_LIBXML_API BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+	return xmlDllMain(hinstDLL, fdwReason, lpvReserved);
+}
+#endif
+
 #endif
 
 /*

--------------040604030405070305050700
Content-Type: text/plain;
 name="php_domxml.c.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="php_domxml.c.diff.txt"

Index: php_domxml.c
===================================================================
RCS file: /repository/php-src/ext/domxml/Attic/php_domxml.c,v
retrieving revision 1.218.2.50.2.2
diff -u -r1.218.2.50.2.2 php_domxml.c
--- php_domxml.c	18 Mar 2006 10:46:27 -0000	1.218.2.50.2.2
+++ php_domxml.c	8 Aug 2006 11:47:17 -0000
@@ -5520,6 +5520,13 @@
 /* }}} */
 #endif /* HAVE_DOMXSLT */
 
+#ifdef PHP_WIN32
+__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+	return xmlDllMain(hinstDLL, fdwReason, lpvReserved);
+}
+#endif
+
 #endif /* HAVE_DOMXML */
 
 /*

--------------040604030405070305050700--