moriyoshi Wed Mar 18 17:43:55 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mbstring/libmbfl/filters mbfilter_cp850.c
mbfilter_cp850.h
unicode_table_cp850.h
Modified files:
/php-src NEWS
/php-src/ext/mbstring config.m4 mbstring.dsp
/php-src/ext/mbstring/libmbfl/filters Makefile.am Makefile.bcc32
/php-src/ext/mbstring/libmbfl/mbfl mbfl_consts.h mbfl_convert.c
mbfl_encoding.c mbfl_encoding.h
mbfl_ident.c
Log:
- Add support for CP850 encoding (patch by Denis Giffeler)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.522&r2=1.2027.2.547.2.965.2.523&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.522
php-src/NEWS:1.2027.2.547.2.965.2.523
--- php-src/NEWS:1.2027.2.547.2.965.2.522 Wed Mar 18 08:16:13 2009
+++ php-src/NEWS Wed Mar 18 17:43:54 2009
@@ -9,6 +9,9 @@
- Added LIBXML_LOADED_VERSION constant (libxml2 version currently used). (Rob)
- Added JSON_FORCE_OBJECT flag to json_encode(). (Scott, Richard Quadling)
+- Added support for CP850 encoding in mbstring extension.
+ (Denis Giffeler, Moriyoshi)
+
- Fixed bug #47678 (Allow loadExtension to be disabled in SQLite3). (Scott)
- Fixed bug #47664 (get_class returns NULL instead of FALSE). (Dmitry)
- Fixed bug #47593 (interface_exists() returns false when using absolute
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.11.2.6&r2=1.58.2.4.2.11.2.7&diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.6
php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.7
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.11.2.6 Thu Jul 24 13:01:49 2008
+++ php-src/ext/mbstring/config.m4 Wed Mar 18 17:43:55 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.58.2.4.2.11.2.6 2008/07/24 13:01:49 moriyoshi Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.11.2.7 2009/03/18 17:43:55 moriyoshi Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -271,6 +271,7 @@
libmbfl/filters/mbfilter_utf8.c
libmbfl/filters/mbfilter_uuencode.c
libmbfl/filters/mbfilter_koi8u.c
+ libmbfl/filters/mbfilter_cp850.c
libmbfl/mbfl/mbfilter.c
libmbfl/mbfl/mbfilter_8bit.c
libmbfl/mbfl/mbfilter_pass.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.dsp?r1=1.21.6.1&r2=1.21.6.2&diff_format=u
Index: php-src/ext/mbstring/mbstring.dsp
diff -u php-src/ext/mbstring/mbstring.dsp:1.21.6.1
php-src/ext/mbstring/mbstring.dsp:1.21.6.2
--- php-src/ext/mbstring/mbstring.dsp:1.21.6.1 Wed Mar 18 17:34:27 2009
+++ php-src/ext/mbstring/mbstring.dsp Wed Mar 18 17:43:55 2009
@@ -374,6 +374,10 @@
# End Source File
# Begin Source File
+SOURCE=.\libmbfl\filters\mbfilter_cp850.c
+# End Source File
+# Begin Source File
+
SOURCE=.\libmbfl\mbfl\mbfilter_pass.c
# End Source File
# Begin Source File
@@ -687,6 +691,10 @@
# End Source File
# Begin Source File
+SOURCE=.\libmbfl\filters\mbfilter_cp850.h
+# End Source File
+# Begin Source File
+
SOURCE=.\libmbfl\mbfl\mbfilter_pass.h
# End Source File
# Begin Source File
@@ -911,6 +919,10 @@
# End Source File
# Begin Source File
+SOURCE=.\libmbfl\filters\unicode_table_cp850.h
+# End Source File
+# Begin Source File
+
SOURCE=.\libmbfl\filters\unicode_table_uhc.h
# End Source File
# End Group
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/Makefile.am?r1=1.4.4.2.2.1&r2=1.4.4.2.2.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/Makefile.am
diff -u php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.2.2.1
php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.2.2.2
--- php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.2.2.1 Sat Jul
5 06:52:04 2008
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.am Wed Mar 18 17:43:55 2009
@@ -52,6 +52,7 @@
mbfilter_koi8r.c \
mbfilter_koi8u.c \
mbfilter_armscii8.c \
+ mbfilter_cp850.c \
html_entities.c \
cp932_table.h \
html_entities.h \
@@ -105,6 +106,7 @@
mbfilter_utf8.h \
mbfilter_uuencode.h \
mbfilter_cp51932.h \
+ mbfilter_cp850.h \
unicode_prop.h \
unicode_table_big5.h \
unicode_table_cns11643.h \
@@ -131,6 +133,7 @@
unicode_table_koi8r.h \
unicode_table_koi8u.h \
unicode_table_armscii8.h \
+ unicode_table_cp850.h \
unicode_table_uhc.h
mbfilter_iso8859_2.c: unicode_table_iso8859_2.h
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32?r1=1.3.6.1&r2=1.3.6.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32
diff -u php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32:1.3.6.1
php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32:1.3.6.2
--- php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32:1.3.6.1 Sat Jul 5
06:52:04 2008
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.bcc32 Wed Mar 18 17:43:55 2009
@@ -49,7 +49,8 @@
mbfilter_koi8r.obj \
mbfilter_koi8u.obj \
html_entities.obj \
- mbfilter_armscii8.obj
+ mbfilter_armscii8.obj \
+ mbfilter_cp850.obj
all: $(OBJS)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h?r1=1.3.6.2&r2=1.3.6.3&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h:1.3.6.2
php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h:1.3.6.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h:1.3.6.2 Tue Feb 24
13:19:09 2009
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_consts.h Wed Mar 18 17:43:55 2009
@@ -79,6 +79,7 @@
#define MBFL_WCSPLANE_ARMSCII8 0x70fb0000
#define MBFL_WCSPLANE_KOI8U 0x70fc0000
#define MBFL_WCSPLANE_CP1254 0x70fd0000 /* 00h - FFh */
+#define MBFL_WCSPLANE_CP850 0x70fe0000 /* 00h - FFh */
#define MBFL_WCSGROUP_MASK 0xffffff
#define MBFL_WCSGROUP_UCS4MAX 0x70000000
#define MBFL_WCSGROUP_WCHARMAX 0x78000000
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c?r1=1.5.2.1.2.3.2.2&r2=1.5.2.1.2.3.2.3&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.5.2.1.2.3.2.2
php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.5.2.1.2.3.2.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.5.2.1.2.3.2.2 Thu Jul
31 17:37:12 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c Wed Mar 18 17:43:55 2009
@@ -93,6 +93,7 @@
#include "filters/mbfilter_ucs2.h"
#include "filters/mbfilter_htmlent.h"
#include "filters/mbfilter_armscii8.h"
+#include "filters/mbfilter_cp850.h"
static void mbfl_convert_filter_reset_vtbl(mbfl_convert_filter *filter);
@@ -223,6 +224,8 @@
&vtbl_wchar_byte2le,
&vtbl_armscii8_wchar,
&vtbl_wchar_armscii8,
+ &vtbl_cp850_wchar,
+ &vtbl_wchar_cp850,
&vtbl_pass,
NULL
};
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c?r1=1.8.4.2.2.1&r2=1.8.4.2.2.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.8.4.2.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.8.4.2.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.8.4.2.2.1 Sat Jul
5 06:52:04 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c Wed Mar 18 17:43:55 2009
@@ -100,6 +100,7 @@
#include "filters/mbfilter_ucs2.h"
#include "filters/mbfilter_htmlent.h"
#include "filters/mbfilter_armscii8.h"
+#include "filters/mbfilter_cp850.h"
#ifndef HAVE_STRCASECMP
#ifdef HAVE_STRICMP
@@ -186,6 +187,7 @@
&mbfl_encoding_koi8r,
&mbfl_encoding_koi8u,
&mbfl_encoding_armscii8,
+ &mbfl_encoding_cp850,
NULL
};
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h?r1=1.5.4.1.2.1&r2=1.5.4.1.2.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.5.4.1.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.5.4.1.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h:1.5.4.1.2.1 Sat Jul
5 06:52:04 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h Wed Mar 18 17:43:55 2009
@@ -103,6 +103,7 @@
mbfl_no_encoding_koi8u,
mbfl_no_encoding_8859_16,
mbfl_no_encoding_armscii8,
+ mbfl_no_encoding_cp850,
mbfl_no_encoding_charset_max
};
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c?r1=1.3.4.2.2.1&r2=1.3.4.2.2.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.3.4.2.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.3.4.2.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.3.4.2.2.1 Sat Jul 5
06:52:04 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c Wed Mar 18 17:43:55 2009
@@ -92,6 +92,7 @@
#include "filters/mbfilter_ucs2.h"
#include "filters/mbfilter_htmlent.h"
#include "filters/mbfilter_armscii8.h"
+#include "filters/mbfilter_cp850.h"
static const struct mbfl_identify_vtbl vtbl_identify_false = {
mbfl_no_encoding_pass,
@@ -140,6 +141,7 @@
&vtbl_identify_8859_14,
&vtbl_identify_8859_15,
&vtbl_identify_armscii8,
+ &vtbl_identify_cp850,
&vtbl_identify_false,
NULL
};
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_cp850.c?view=markup&rev=1.1
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_cp850.c
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_cp850.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_cp850.h?view=markup&rev=1.1
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_cp850.h
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_cp850.h
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/unicode_table_cp850.h?view=markup&rev=1.1
Index: php-src/ext/mbstring/libmbfl/filters/unicode_table_cp850.h
+++ php-src/ext/mbstring/libmbfl/filters/unicode_table_cp850.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
