cvs: /php4/ext/xml/expat Makefile expat.dsw expat.html expat.mak /php4/ext/xml/expat/xmlparse hashtable.c hashtable.h xmlparse.c xmlparse.dsp
xmlparse.h /php4/ext/xml/expat/xmltok asciitab.h iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h xmlrole.c xmlrole.h xmltok.c xmltok.dsp xmltok.h
xmltok_impl.c xmltok_impl.h xmltok_ns.c /php4 config.w32.h internal_functions_win32.c php4dll.dsp php4dllts.dsp /php4/ext/xml xml.c
| From: | Zeev Suraski | Date: | Wed, 02 Feb 2000 18:42:34 +0000 |
| Subject: | cvs: /php4/ext/xml/expat Makefile expat.dsw expat.html expat.mak /php4/ext/xml/expat/xmlparse hashtable.c hashtable.h xmlparse.c xmlparse.dsp xmlparse.h /php4/ext/xml/expat/xmltok asciitab.h iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h xmlrole.c xmlrole.h xmltok.c xmltok.dsp xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c /php4 config.w32.h internal_functions_win32.c php4dll.dsp php4dllts.dsp /php4/ext/xml xml.c |
||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-9691@lists.php.net to get a copy of this message | ||
zeev Wed Feb 2 19:42:34 2000 EDT
Added files:
/php4/ext/xml/expat Makefile expat.dsw expat.html expat.mak
/php4/ext/xml/expat/xmlparse hashtable.c hashtable.h xmlparse.c
xmlparse.dsp xmlparse.h
/php4/ext/xml/expat/xmltok asciitab.h iasciitab.h latin1tab.h
nametab.h utf8tab.h xmldef.h xmlrole.c
xmlrole.h xmltok.c xmltok.dsp xmltok.h
xmltok_impl.c xmltok_impl.h xmltok_ns.c
Modified files:
/php4 config.w32.h internal_functions_win32.c php4dll.dsp
php4dllts.dsp
/php4/ext/xml xml.c
Log:
Add expat to the distribution
Add expat support to Win32 builds
Index: php4/config.w32.h
diff -u php4/config.w32.h:1.17 php4/config.w32.h:1.18
--- php4/config.w32.h:1.17 Tue Nov 9 20:53:38 1999
+++ php4/config.w32.h Wed Feb 2 19:42:02 2000
@@ -15,6 +15,9 @@
/* set to enable bundled PCRE library */
#define HAVE_BUNDLED_PCRE 1
+/* set to enable bundled expat library */
+#define HAVE_LIBEXPAT 1
+
/* should be added to runtime config*/
#define PHP3_URL_FOPEN 1
Index: php4/internal_functions_win32.c
diff -u php4/internal_functions_win32.c:1.22 php4/internal_functions_win32.c:1.23
--- php4/internal_functions_win32.c:1.22 Sat Jan 1 02:31:27 2000
+++ php4/internal_functions_win32.c Wed Feb 2 19:42:02 2000
@@ -18,7 +18,7 @@
*/
-/* $Id: internal_functions_win32.c,v 1.22 2000/01/01 01:31:27 sas Exp $ */
+/* $Id: internal_functions_win32.c,v 1.23 2000/02/02 18:42:02 zeev Exp $ */
#include "php.h"
@@ -54,6 +54,7 @@
#include "ext/pcre/php_pcre.h"
#include "ext/odbc/php_odbc.h"
#include "ext/session/php_session.h"
+#include "ext/xml/php_xml.h"
/* SNMP has to be moved to ext */
/* #include "dl/snmp/php_snmp.h" */
@@ -87,7 +88,8 @@
phpext_session_ptr,
phpext_output_ptr,
phpext_array_ptr,
- phpext_assert_ptr
+ phpext_assert_ptr,
+ phpext_xml_ptr
};
#define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
Index: php4/php4dll.dsp
diff -u php4/php4dll.dsp:1.30 php4/php4dll.dsp:1.31
--- php4/php4dll.dsp:1.30 Fri Jan 28 18:24:49 2000
+++ php4/php4dll.dsp Wed Feb 2 19:42:02 2000
@@ -145,6 +145,21 @@
# Begin Source File
SOURCE=.\internal_functions_win32.c
+
+!IF "$(CFG)" == "php4dll - Win32 Debug"
+
+# ADD CPP /I "ext\xml\expat\xmlparse" /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+
+!ENDIF
+
# End Source File
# Begin Source File
@@ -164,15 +179,15 @@
# End Source File
# Begin Source File
-SOURCE=.\php_variables.c
+SOURCE=.\php_ini.c
# End Source File
# Begin Source File
-SOURCE=.\php_ini.c
+SOURCE=.\php_realpath.c
# End Source File
# Begin Source File
-SOURCE=.\php_realpath.c
+SOURCE=.\php_variables.c
# End Source File
# Begin Source File
@@ -264,15 +279,15 @@
# End Source File
# Begin Source File
-SOURCE=.\php_variables.h
+SOURCE=.\php_ini.h
# End Source File
# Begin Source File
-SOURCE=.\php_ini.h
+SOURCE=.\php_realpath.h
# End Source File
# Begin Source File
-SOURCE=.\php_realpath.h
+SOURCE=.\php_variables.h
# End Source File
# Begin Source File
@@ -308,10 +323,6 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\ext\apache\apache.c
-# End Source File
-# Begin Source File
-
SOURCE=.\ext\standard\array.c
# End Source File
# Begin Source File
@@ -747,6 +758,119 @@
SOURCE=.\ext\pcre\pcrelib\pcre.h
# End Source File
+# End Group
+# End Group
+# Begin Group "XML"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files No. 4"
+
+# PROP Default_Filter ".c"
+# Begin Source File
+
+SOURCE=.\ext\xml\xml.c
+
+!IF "$(CFG)" == "php4dll - Win32 Debug"
+
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Header Files No. 4"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\ext\xml\php_xml.h
+# End Source File
+# End Group
+# Begin Group "expat"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files No. 5"
+
+# PROP Default_Filter ".c"
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmlparse\hashtable.c
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmlparse\xmlparse.c
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmlrole.c
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok.c
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+# End Source File
+# End Group
+# Begin Group "Header Files No. 5"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\asciitab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\iasciitab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\latin1tab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\nametab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\utf8tab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmldef.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmlrole.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok_impl.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok_impl.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok_ns.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
# End Group
# End Group
# End Group
Index: php4/php4dllts.dsp
diff -u php4/php4dllts.dsp:1.47 php4/php4dllts.dsp:1.48
--- php4/php4dllts.dsp:1.47 Fri Jan 28 18:24:49 2000
+++ php4/php4dllts.dsp Wed Feb 2 19:42:02 2000
@@ -145,6 +145,7 @@
# Begin Source File
SOURCE=.\internal_functions_win32.c
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
# End Source File
# Begin Source File
@@ -308,10 +309,6 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\ext\apache\apache.c
-# End Source File
-# Begin Source File
-
SOURCE=.\ext\standard\array.c
# End Source File
# Begin Source File
@@ -712,6 +709,169 @@
SOURCE=.\regex\regfree.c
# End Source File
+# End Group
+# Begin Group "XML"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files No. 4"
+
+# PROP Default_Filter ".c"
+# Begin Source File
+
+SOURCE=.\ext\xml\xml.c
+# ADD CPP /I "ext\xml\expat\xmltok" /I "ext\xml\expat\xmlparse"
+# End Source File
+# End Group
+# Begin Group "Header Files No. 4"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\ext\xml\php_xml.h
+# End Source File
+# End Group
+# Begin Group "expat"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files No. 5"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\hashtable.c
+
+!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\xmlparse.c
+
+!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmlrole.c
+
+!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok.c
+
+!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+
+# ADD CPP /I "ext\xml\expat\xmltok"
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Header Files No. 5"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\asciitab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hashtable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\iasciitab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\latin1tab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\nametab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\utf8tab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmldef.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\xmlparse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmlrole.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok_impl.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok_impl.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ext\xml\expat\xmltok\xmltok_ns.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# End Group
# End Group
# End Group
# Begin Group "Win32"
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.42 php4/ext/xml/xml.c:1.43
--- php4/ext/xml/xml.c:1.42 Sat Jan 1 02:31:56 2000
+++ php4/ext/xml/xml.c Wed Feb 2 19:42:03 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.42 2000/01/01 01:31:56 sas Exp $ */
+/* $Id: xml.c,v 1.43 2000/02/02 18:42:03 zeev Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -476,7 +476,7 @@
while (pos > 0) {
c = encoder ? encoder((unsigned char)(*s)) : (unsigned short)(*s);
if (c < 0x80) {
- newbuf[(*newlen)++] = c;
+ newbuf[(*newlen)++] = (char) c;
} else if (c < 0x800) {
newbuf[(*newlen)++] = (0xc0 | (c >> 6));
newbuf[(*newlen)++] = (0x80 | (c & 0x3f));