[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c /ext/mbstring/libmbfl/filters mk_sb_tbl.awk unicode_table_iso8859_10.h unicode_table_iso8859_13.h unicode_table_iso8859_14.h unicode_table_iso8859_15.h unicode_table_iso8859_16.h unicode_table_iso8859_2.h unicode_table_iso8859_3.h unicode_table_iso8859_4.h unicode_table_iso8859_5.h unicode_table_iso8859_6.h unicode_table_iso8859_7.h unicode_table_iso8859_8.h unicode_table_iso8859_9.h
moriyoshi Mon Feb 21 03:03:49 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
/php-src/ext/mbstring/libmbfl/filters mk_sb_tbl.awk
unicode_table_iso8859_10.h
unicode_table_iso8859_13.h
unicode_table_iso8859_14.h
unicode_table_iso8859_15.h
unicode_table_iso8859_16.h
unicode_table_iso8859_2.h
unicode_table_iso8859_3.h
unicode_table_iso8859_4.h
unicode_table_iso8859_5.h
unicode_table_iso8859_6.h
unicode_table_iso8859_7.h
unicode_table_iso8859_8.h
unicode_table_iso8859_9.h
Log:
- MFH: fix compiler warnings.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.46r2=1.142.2.47ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.46
php-src/ext/mbstring/mbstring.c:1.142.2.47
--- php-src/ext/mbstring/mbstring.c:1.142.2.46 Sun Jan 16 10:56:05 2005
+++ php-src/ext/mbstring/mbstring.c Mon Feb 21 03:03:47 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.46 2005/01/16 15:56:05 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47 2005/02/21 08:03:47 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -147,7 +147,7 @@
};
-php_mb_nls_ident_list php_mb_default_identify_list[] = {
+static const php_mb_nls_ident_list php_mb_default_identify_list[] = {
{ mbfl_no_language_japanese, php_mb_default_identify_list_ja,
sizeof(php_mb_default_identify_list_ja) /
sizeof(php_mb_default_identify_list_ja[0]) },
{ mbfl_no_language_korean, php_mb_default_identify_list_kr,
sizeof(php_mb_default_identify_list_kr) /
sizeof(php_mb_default_identify_list_kr[0]) },
{ mbfl_no_language_traditional_chinese,
php_mb_default_identify_list_tw_hk, sizeof(php_mb_default_identify_list_tw_hk)
/ sizeof(php_mb_default_identify_list_tw_hk[0]) },
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk?r1=1.1.4.1r2=1.1.4.2ty=u
Index: php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk
diff -u php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.4.1
php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.4.2
--- php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.4.1 Mon Feb 21
02:10:13 2005
+++ php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk Mon Feb 21 03:03:48 2005
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#
-# $Id: mk_sb_tbl.awk,v 1.1.4.1 2005/02/21 07:10:13 moriyoshi Exp $
+# $Id: mk_sb_tbl.awk,v 1.1.4.2 2005/02/21 08:03:48 moriyoshi Exp $
#
# Description: a script that generates a single byte code set to Unicode
# mapping table.
@@ -46,7 +46,7 @@
print #ifndef IFNDEF_NAME
}
- print static const unsigned int TABLE_NAME [] = {
+ print static const int TABLE_NAME [] = {
i = 160;
for (;;) {
printf(\t0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,
0x%04x, 0x%04x, tbl[i++], tbl[i++], tbl[i++], tbl[i++], tbl[i++], tbl[i++],
tbl[i++], tbl[i++]);
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h
diff -u php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h:1.1.2.2
php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h:1.1.2.3
--- php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h:1.1.2.2
Mon Feb 21 02:10:13 2005
+++ php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h Mon Feb
21 03:03:48 2005
@@ -1,6 +1,6 @@
/* This file is automatically generated. Do not edit! */
#ifndef UNICODE_TABLE_ISO8859_10_H
-static const unsigned int iso8859_10_ucs_table[] = {
+static const int iso8859_10_ucs_table[] = {
0x00a0, 0x0104, 0x0112, 0x0122, 0x012a, 0x0128, 0x0136, 0x00a7,
0x013b, 0x0110, 0x0160, 0x0166, 0x017d, 0x00ad, 0x016a, 0x014a,
0x00b0, 0x0105, 0x0113, 0x0123, 0x012b, 0x0129, 0x0137, 0x00b7,
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h
diff -u php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h:1.1.2.2
php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h:1.1.2.3
---
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
Go a-HEAD :)
At 02:17 AM 6/25/2004 +0900, Moriyoshi Koizumi wrote:
I want to have this patch merged into HEAD.
Moriyoshi
On 2004/06/24, at 7:07, Moriyoshi Koizumi wrote:
moriyoshi Wed Jun 23 18:07:02 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
- Fix buf #28466 (mbstring_convert_variables() problem).
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?
r1=1.142.2.44r2=1.142.2.45ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.44
php-src/ext/mbstring/mbstring.c:1.142.2.45
--- php-src/ext/mbstring/mbstring.c:1.142.2.44 Wed Mar 10 15:56:07 2004
+++ php-src/ext/mbstring/mbstring.c Wed Jun 23 18:07:01 2004
@@ -17,7 +17,7 @@
+-- +
*/
-/* $Id: mbstring.c,v 1.142.2.44 2004/03/10 20:56:07 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.45 2004/06/23 22:07:01 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3273,6 +3273,7 @@
stack[stack_level] = var;
stack_level++;
var =
hash_entry;
+
SEPARATE_ZVAL(hash_entry);
target_hash = HASH_OF(*var);
if
(target_hash != NULL) {
zend_hash_internal_pointer_reset(target_hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
I want to have this patch merged into HEAD.
Moriyoshi
On 2004/06/24, at 7:07, Moriyoshi Koizumi wrote:
moriyoshi Wed Jun 23 18:07:02 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
- Fix buf #28466 (mbstring_convert_variables() problem).
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?
r1=1.142.2.44r2=1.142.2.45ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.44
php-src/ext/mbstring/mbstring.c:1.142.2.45
--- php-src/ext/mbstring/mbstring.c:1.142.2.44 Wed Mar 10 15:56:07 2004
+++ php-src/ext/mbstring/mbstring.c Wed Jun 23 18:07:01 2004
@@ -17,7 +17,7 @@
+--
+
*/
-/* $Id: mbstring.c,v 1.142.2.44 2004/03/10 20:56:07 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.45 2004/06/23 22:07:01 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3273,6 +3273,7 @@
stack[stack_level] =
var;
stack_level++;
var = hash_entry;
+
SEPARATE_ZVAL(hash_entry);
target_hash =
HASH_OF(*var);
if (target_hash !=
NULL) {
zend_hash_internal_pointer_reset(target_hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Wed Jun 23 18:07:02 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
- Fix buf #28466 (mbstring_convert_variables() problem).
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.44r2=1.142.2.45ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.44
php-src/ext/mbstring/mbstring.c:1.142.2.45
--- php-src/ext/mbstring/mbstring.c:1.142.2.44 Wed Mar 10 15:56:07 2004
+++ php-src/ext/mbstring/mbstring.c Wed Jun 23 18:07:01 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.44 2004/03/10 20:56:07 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.45 2004/06/23 22:07:01 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3273,6 +3273,7 @@
stack[stack_level] =
var;
stack_level++;
var = hash_entry;
+
SEPARATE_ZVAL(hash_entry);
target_hash =
HASH_OF(*var);
if (target_hash !=
NULL) {
zend_hash_internal_pointer_reset(target_hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Wed Mar 10 15:56:09 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring mbstring.c Log: - MFH (r-1.212): Revert ini setting patch as I notified in... http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.43r2=1.142.2.44ty=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.142.2.43 php-src/ext/mbstring/mbstring.c:1.142.2.44 --- php-src/ext/mbstring/mbstring.c:1.142.2.43 Sat Mar 6 14:30:35 2004 +++ php-src/ext/mbstring/mbstring.c Wed Mar 10 15:56:07 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.142.2.43 2004/03/06 19:30:35 iliaa Exp $ */ +/* $Id: mbstring.c,v 1.142.2.44 2004/03/10 20:56:07 moriyoshi Exp $ */ /* * PHP4 Multibyte String module mbstring @@ -792,7 +792,8 @@ PHP_INI_ENTRY(mbstring.script_encoding, NULL, PHP_INI_ALL, OnUpdate_mbstring_script_encoding) #endif /* ZEND_MULTIBYTE */ PHP_INI_ENTRY(mbstring.substitute_character, NULL, PHP_INI_ALL, OnUpdate_mbstring_substitute_character) -STD_PHP_INI_ENTRY(mbstring.func_overload, 0, PHP_INI_SYSTEM, OnUpdateInt, func_overload, zend_mbstring_globals, mbstring_globals) +STD_PHP_INI_ENTRY(mbstring.func_overload, 0, PHP_INI_SYSTEM | +PHP_INI_PERDIR, OnUpdateInt, func_overload, zend_mbstring_globals, mbstring_globals) STD_PHP_INI_BOOLEAN(mbstring.encoding_translation, 0, PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdate_mbstring_encoding_translation, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Wed Dec 10 12:36:07 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
Eliminate compiler warnings.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.39
php-src/ext/mbstring/mbstring.c:1.142.2.40
--- php-src/ext/mbstring/mbstring.c:1.142.2.39 Tue Nov 11 17:18:24 2003
+++ php-src/ext/mbstring/mbstring.c Wed Dec 10 12:36:05 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.39 2003/11/11 22:18:24 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.40 2003/12/10 17:36:05 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -405,7 +405,7 @@
}
size = n + identify_list_size;
/* make list */
- list = (int *)pecalloc(size, sizeof(int), persistent);
+ list = (enum mbfl_no_encoding *)pecalloc(size, sizeof(int),
persistent);
if (list != NULL) {
entry = list;
n = 0;
@@ -513,7 +513,7 @@
zend_hash_internal_pointer_reset(target_hash);
i = zend_hash_num_elements(target_hash);
size = i + identify_list_size;
- list = (int *)pecalloc(size, sizeof(int), persistent);
+ list = (enum mbfl_no_encoding *)pecalloc(size, sizeof(int),
persistent);
if (list != NULL) {
entry = list;
bauto = 0;
@@ -624,7 +624,8 @@
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_detect_order) */
static PHP_INI_MH(OnUpdate_mbstring_detect_order)
{
- int *list, size;
+ enum mbfl_no_encoding *list;
+ int size;
if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1
TSRMLS_CC)) {
if (MBSTRG(detect_order_list) != NULL) {
@@ -643,7 +644,8 @@
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_http_input) */
static PHP_INI_MH(OnUpdate_mbstring_http_input)
{
- int *list, size;
+ enum mbfl_no_encoding *list;
+ int size;
if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1
TSRMLS_CC)) {
if (MBSTRG(http_input_list) != NULL) {
@@ -939,7 +941,8 @@
/* {{{ PHP_RINIT_FUNCTION(mbstring) */
PHP_RINIT_FUNCTION(mbstring)
{
- int n, *list=NULL, *entry;
+ int n;
+ enum mbfl_no_encoding *list=NULL, *entry;
zend_function *func, *orig;
const struct mb_overload_def *p;
@@ -996,7 +999,7 @@
list = MBSTRG(default_detect_order_list);
n = MBSTRG(default_detect_order_list_size);
}
- entry = (int *)safe_emalloc(n, sizeof(int), 0);
+ entry = (enum mbfl_no_encoding *)safe_emalloc(n, sizeof(int), 0);
MBSTRG(current_detect_order_list) = entry;
MBSTRG(current_detect_order_list_size) = n;
while (n 0) {
@@ -1201,7 +1204,8 @@
PHP_FUNCTION(mb_http_input)
{
pval **arg1;
- int result=0, retname, n, *entry;
+ int result=0, retname, n;
+ enum mbfl_no_encoding *entry;
char *name, *list, *temp;
retname = 1;
@@ -1326,7 +1330,8 @@
PHP_FUNCTION(mb_detect_order)
{
pval **arg1;
- int n, size, *list, *entry;
+ int n, size;
+ enum mbfl_no_encoding *list, *entry;
char *name;
if (ZEND_NUM_ARGS() == 0) {
@@ -1467,8 +1472,8 @@
char *var, *val, *s1, *s2;
char *strtok_buf = NULL, **val_list;
zval *array_ptr = (zval *) arg;
- int n, num, val_len, *len_list, *elist, elistsz;
- enum mbfl_no_encoding from_encoding, to_encoding;
+ int n, num, val_len, *len_list, elistsz;
+ enum mbfl_no_encoding from_encoding, to_encoding, *elist;
mbfl_string string, resvar, resval;
mbfl_encoding_detector *identd = NULL;
mbfl_buffer_converter *convd = NULL;
@@ -3792,7 +3797,8 @@
enum mbfl_no_encoding encoding = mbfl_no_encoding_invalid;
mbfl_encoding_detector *identd = NULL;
- int size, *list;
+ int size;
+ enum mbfl_no_encoding *list;
if (MBSTRG(http_input_list_size) == 1
MBSTRG(http_input_list)[0] == mbfl_no_encoding_pass) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Wed Dec 10 12:44:13 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
Eliminate compiler warnings.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.40
php-src/ext/mbstring/mbstring.c:1.142.2.41
--- php-src/ext/mbstring/mbstring.c:1.142.2.40 Wed Dec 10 12:36:05 2003
+++ php-src/ext/mbstring/mbstring.c Wed Dec 10 12:44:12 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.40 2003/12/10 17:36:05 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.41 2003/12/10 17:44:12 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -1755,7 +1755,8 @@
{
pval **arg_str, **arg_array, *track_vars_array;
char *var, *val, *encstr, *strtok_buf, **str_list, *separator;
- int n, num, val_len, *len_list, *elist, elistsz, old_rg, argc;
+ int n, num, val_len, *len_list, elistsz, old_rg, argc;
+ enum mbfl_no_encoding *elist;
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_string string, resvar, resval;
mbfl_encoding_detector *identd;
@@ -2573,7 +2574,8 @@
mbfl_string string, result, *ret = NULL;
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_buffer_converter *convd;
- int size, *list;
+ int size;
+ enum mbfl_no_encoding *list;
char *output=NULL;
if (output_len) {
@@ -2804,7 +2806,8 @@
mbfl_string string;
const char *ret;
enum mbfl_no_encoding *elist;
- int size, *list, strict = 0;
+ int size, strict = 0;
+ enum mbfl_no_encoding *list;
if (ZEND_NUM_ARGS() == 1) {
if (zend_get_parameters_ex(1, arg_str) == FAILURE) {
@@ -3093,7 +3096,8 @@
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_encoding_detector *identd;
mbfl_buffer_converter *convd;
- int n, argc, stack_level, stack_max, *elist, elistsz;
+ int n, argc, stack_level, stack_max, elistsz;
+ enum mbfl_no_encoding *elist;
char *name;
void *ptmp;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Tue Nov 11 14:57:49 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
MFH(r-1.204): Compiler warning fix (patch by Joe Orton).
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.37
php-src/ext/mbstring/mbstring.c:1.142.2.38
--- php-src/ext/mbstring/mbstring.c:1.142.2.37 Thu Nov 6 10:41:36 2003
+++ php-src/ext/mbstring/mbstring.c Tue Nov 11 14:57:48 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.37 2003/11/06 15:41:36 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.38 2003/11/11 19:57:48 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -2565,7 +2565,7 @@
/* {{{ MBSTRING_API char *php_mb_convert_encoding() */
MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char
*_to_encoding, char *_from_encodings, size_t *output_len TSRMLS_DC)
{
- mbfl_string string, result, *ret;
+ mbfl_string string, result, *ret = NULL;
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_buffer_converter *convd;
int size, *list;
@@ -3789,7 +3789,7 @@
{
mbfl_string string;
enum mbfl_no_encoding *elist;
- enum mbfl_no_encoding encoding;
+ enum mbfl_no_encoding encoding = mbfl_no_encoding_invalid;
mbfl_encoding_detector *identd = NULL;
int size, *list;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
hirokawaTue Nov 11 17:18:28 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
fixed compilation warning. (patched by Joe Orton)
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.38
php-src/ext/mbstring/mbstring.c:1.142.2.39
--- php-src/ext/mbstring/mbstring.c:1.142.2.38 Tue Nov 11 14:57:48 2003
+++ php-src/ext/mbstring/mbstring.c Tue Nov 11 17:18:24 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.38 2003/11/11 19:57:48 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.39 2003/11/11 22:18:24 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -2284,7 +2284,7 @@
{
pval **arg1, **arg2, **arg3, **arg4;
int argc, from, len, mblen;
- mbfl_string string, result, *ret;
+ mbfl_string string, result, *ret = NULL;
mbfl_string_init(string);
string.no_language = MBSTRG(current_language);
@@ -3726,7 +3726,7 @@
TSRMLS_DC)
{
int i;
- mbfl_string string, result, *ret;
+ mbfl_string string, result, *ret = NULL;
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_buffer_converter *convd;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
hirokawaThu Nov 6 10:41:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c mbstring.h
/php-src/main rfc1867.c
Log:
bug fixed: name parameter of multipart form was not converted into internal encoding
when mbstring.encoding_translation is on.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.36
php-src/ext/mbstring/mbstring.c:1.142.2.37
--- php-src/ext/mbstring/mbstring.c:1.142.2.36 Tue Nov 4 23:28:00 2003
+++ php-src/ext/mbstring/mbstring.c Thu Nov 6 10:41:36 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.36 2003/11/05 04:28:00 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.37 2003/11/06 15:41:36 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3722,9 +3722,10 @@
/* }}} */
/* {{{ MBSTRING_API int php_mb_gpc_encoding_converter() */
-MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, const char
*encoding_to, const char *encoding_from
+MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, int num, const
char *encoding_to, const char *encoding_from
TSRMLS_DC)
{
+ int i;
mbfl_string string, result, *ret;
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_buffer_converter *convd;
@@ -3758,35 +3759,38 @@
string.no_encoding = from_encoding;
string.no_language = MBSTRG(current_language);
- string.val = (char*)(*str);
- string.len = *len;
+ for (i=0; inum; i++){
+ string.val = (char*)str[i];
+ string.len = len[i];
- /* initialize converter */
- convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len);
- if (convd == NULL) {
- return -1;
- }
- mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode));
- mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
+ /* initialize converter */
+ convd = mbfl_buffer_converter_new(from_encoding, to_encoding,
string.len);
+ if (convd == NULL) {
+ return -1;
+ }
+ mbfl_buffer_converter_illegal_mode(convd,
MBSTRG(current_filter_illegal_mode));
+ mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
- /* do it */
- ret = mbfl_buffer_converter_feed_result(convd, string, result);
- if (ret != NULL) {
- efree(*str);
- *str = ret-val;
- *len = ret-len;
+ /* do it */
+ ret = mbfl_buffer_converter_feed_result(convd, string, result);
+ if (ret != NULL) {
+ efree(str[i]);
+ str[i] = ret-val;
+ len[i] = ret-len;
+ }
+ mbfl_buffer_converter_delete(convd);
}
- mbfl_buffer_converter_delete(convd);
return ret ? 0 : -1;
}
/* {{{ MBSTRING_API int php_mb_gpc_encoding_detector()
*/
-MBSTRING_API int php_mb_gpc_encoding_detector(const char *arg_string, int arg_length,
char *arg_list TSRMLS_DC)
+MBSTRING_API int php_mb_gpc_encoding_detector(char **arg_string, int *arg_length, int
num, char *arg_list TSRMLS_DC)
{
mbfl_string string;
enum mbfl_no_encoding *elist;
enum mbfl_no_encoding encoding;
+ mbfl_encoding_detector *identd = NULL;
int size, *list;
@@ -3830,9 +3834,22 @@
mbfl_string_init(string);
string.no_language = MBSTRG(current_language);
- string.val = (char*)arg_string;
- string.len = arg_length;
- encoding = mbfl_identify_encoding_no(string, elist, size);
+
+ identd = mbfl_encoding_detector_new(elist, size);
+
+ if (identd) {
+ int n = 0;
+ while(n num){
+ string.val = (unsigned char *)arg_string[n];
+ string.len = arg_length[n];
+ if (mbfl_encoding_detector_feed(identd, string)) {
+ break;
+ }
+ n++;
+ }
+ encoding = mbfl_encoding_detector_judge(identd);
+ mbfl_encoding_detector_delete(identd);
+ }
if (encoding != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify) = encoding;
Index: php-src/ext/mbstring/mbstring.h
diff -u php-src/ext/mbstring/mbstring.h:1.40.2.11
php-src/ext/mbstring/mbstring.h:1.40.2.12
--- php-src/ext/mbstring/mbstring.h:1.40.2.11 Sun Oct 26 02:47:42 2003
+++ php-src/ext/mbstring/mbstring.h Thu Nov 6 10:41:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id:
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Tue Nov 4 23:24:56 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring mbstring.c Log: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Tue Nov 4 23:28:01 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring mbstring.c Log: Fixed bug #26128 (mbstring prints out wrong information on phpinfo()) Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.142.2.35 php-src/ext/mbstring/mbstring.c:1.142.2.36 --- php-src/ext/mbstring/mbstring.c:1.142.2.35 Tue Nov 4 23:24:54 2003 +++ php-src/ext/mbstring/mbstring.c Tue Nov 4 23:28:00 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.142.2.35 2003/11/05 04:24:54 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.142.2.36 2003/11/05 04:28:00 moriyoshi Exp $ */ /* * PHP4 Multibyte String module mbstring -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
fmk Wed Oct 29 12:37:11 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
Adding missing TSRMLS_CC to fix zts build
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.32
php-src/ext/mbstring/mbstring.c:1.142.2.33
--- php-src/ext/mbstring/mbstring.c:1.142.2.32 Sun Oct 26 02:47:42 2003
+++ php-src/ext/mbstring/mbstring.c Wed Oct 29 12:37:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.32 2003/10/26 07:47:42 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.33 2003/10/29 17:37:10 fmk Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -1357,7 +1357,7 @@
size = 0;
switch (Z_TYPE_PP(arg1)) {
case IS_ARRAY:
- if (!php_mb_parse_encoding_array(*arg1, list, size, 0)) {
+ if (!php_mb_parse_encoding_array(*arg1, list, size, 0
TSRMLS_CC)) {
if (list) {
efree(list);
}
@@ -2832,7 +2832,7 @@
if (ZEND_NUM_ARGS() = 2 Z_STRVAL_PP(arg_list)) {
switch (Z_TYPE_PP(arg_list)) {
case IS_ARRAY:
- if (!php_mb_parse_encoding_array(*arg_list, list, size, 0)) {
+ if (!php_mb_parse_encoding_array(*arg_list, list, size, 0
TSRMLS_CC)) {
if (list) {
efree(list);
size = 0;
@@ -3135,7 +3135,7 @@
elistsz = 0;
switch (Z_TYPE_PP(args[1])) {
case IS_ARRAY:
- php_mb_parse_encoding_array(*args[1], elist, elistsz, 0);
+ php_mb_parse_encoding_array(*args[1], elist, elistsz, 0 TSRMLS_CC);
break;
default:
convert_to_string_ex(args[1]);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
thetaphiWed Oct 29 20:05:26 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
Fix ZTS build #2
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.33
php-src/ext/mbstring/mbstring.c:1.142.2.34
--- php-src/ext/mbstring/mbstring.c:1.142.2.33 Wed Oct 29 12:37:10 2003
+++ php-src/ext/mbstring/mbstring.c Wed Oct 29 20:05:25 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.33 2003/10/29 17:37:10 fmk Exp $ */
+/* $Id: mbstring.c,v 1.142.2.34 2003/10/30 01:05:25 thetaphi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -1887,7 +1887,7 @@
convd = mbfl_buffer_converter_new(from_encoding, to_encoding, 0);
if (convd != NULL) {
mbfl_buffer_converter_illegal_mode(convd,
MBSTRG(current_filter_illegal_mode));
- mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar) TSRMLS_CC);
+ mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to create
converter);
}
@@ -3841,7 +3841,7 @@
string.no_language = MBSTRG(current_language);
string.val = (char*)arg_string;
string.len = arg_length;
- encoding = mbfl_identify_encoding_no(string, elist, size TSRMLS_CC);
+ encoding = mbfl_identify_encoding_no(string, elist, size);
if (encoding != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify) = encoding;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c mbstring.h
hirokawaSun Oct 26 02:47:43 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c mbstring.h
Log:
revert my previous patch.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.31
php-src/ext/mbstring/mbstring.c:1.142.2.32
--- php-src/ext/mbstring/mbstring.c:1.142.2.31 Sat Oct 25 23:41:18 2003
+++ php-src/ext/mbstring/mbstring.c Sun Oct 26 02:47:42 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.31 2003/10/26 03:41:18 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.32 2003/10/26 07:47:42 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -361,12 +361,6 @@
* Even if any illegal encoding is detected the result may contain a list
* of parsed encodings.
*/
-
-/* {{{ static int php_mb_parse_encoding_list()
- * Return 0 if input contains any illegal encoding, otherwise 1.
- * Even if any illegal encoding is detected the result may contain a list
- * of parsed encodings.
- */
static int
php_mb_parse_encoding_list(const char *value, int value_length, enum mbfl_no_encoding
**return_list, int *return_size, int persistent TSRMLS_DC)
{
@@ -3737,10 +3731,9 @@
/* }}} */
/* {{{ MBSTRING_API int php_mb_gpc_encoding_converter() */
-MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, int num, const
char *encoding_to, const char *encoding_from
+MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, const char
*encoding_to, const char *encoding_from
TSRMLS_DC)
{
- int i;
mbfl_string string, result, *ret;
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_buffer_converter *convd;
@@ -3774,38 +3767,35 @@
string.no_encoding = from_encoding;
string.no_language = MBSTRG(current_language);
- for (i=0; inum; i++) {
- string.val = (char*)str[i];
- string.len = len[i];
+ string.val = (char*)(*str);
+ string.len = *len;
- /* initialize converter */
- convd = mbfl_buffer_converter_new(from_encoding, to_encoding,
string.len);
- if (convd == NULL) {
- return -1;
- }
- mbfl_buffer_converter_illegal_mode(convd,
MBSTRG(current_filter_illegal_mode));
- mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
+ /* initialize converter */
+ convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len);
+ if (convd == NULL) {
+ return -1;
+ }
+ mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode));
+ mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
- /* do it */
- ret = mbfl_buffer_converter_feed_result(convd, string, result);
- if (ret != NULL) {
- efree(str[i]);
- str[i] = ret-val;
- len[i] = ret-len;
- }
- mbfl_buffer_converter_delete(convd);
+ /* do it */
+ ret = mbfl_buffer_converter_feed_result(convd, string, result);
+ if (ret != NULL) {
+ efree(*str);
+ *str = ret-val;
+ *len = ret-len;
}
+ mbfl_buffer_converter_delete(convd);
return ret ? 0 : -1;
}
/* {{{ MBSTRING_API int php_mb_gpc_encoding_detector()
*/
-MBSTRING_API int php_mb_gpc_encoding_detector(char **arg_string, int *arg_length, int
num, char *arg_list TSRMLS_DC)
+MBSTRING_API int php_mb_gpc_encoding_detector(const char *arg_string, int arg_length,
char *arg_list TSRMLS_DC)
{
mbfl_string string;
enum mbfl_no_encoding *elist;
enum mbfl_no_encoding encoding;
- mbfl_encoding_detector *identd = NULL;
int size, *list;
@@ -3849,22 +3839,9 @@
mbfl_string_init(string);
string.no_language = MBSTRG(current_language);
-
- identd = mbfl_encoding_detector_new(elist, size);
-
- if (identd) {
- int n = 0;
- while (n num) {
- string.val = (unsigned char*)arg_string[n];
- string.len = arg_length[n];
- if (mbfl_encoding_detector_feed(identd, string)) {
- break;
- }
- n++;
- }
- encoding = mbfl_encoding_detector_judge(identd);
- mbfl_encoding_detector_delete(identd);
- }
+ string.val = (char*)arg_string;
+ string.len = arg_length;
+ encoding = mbfl_identify_encoding_no(string, elist, size TSRMLS_CC);
if (encoding != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify) =
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
hirokawaSat Oct 25 06:30:52 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c mbstring.h
/php-src/main rfc1867.c
Log:
name/value in multipart/form-date will be converted into internal encoding when
mbstring.encoding_translation is On.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.28
php-src/ext/mbstring/mbstring.c:1.142.2.29
--- php-src/ext/mbstring/mbstring.c:1.142.2.28 Thu Oct 2 06:10:52 2003
+++ php-src/ext/mbstring/mbstring.c Sat Oct 25 06:30:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.28 2003/10/02 10:10:52 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.29 2003/10/25 10:30:50 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -309,7 +309,7 @@
* of parsed encodings.
*/
static int
-php_mb_parse_encoding_list(const char *value, int value_length, int **return_list,
int *return_size, int persistent)
+php_mb_parse_encoding_list(const char *value, int value_length, int **return_list,
int *return_size, int persistent TSRMLS_DC)
{
int n, l, size, bauto, *src, *list, *entry, ret = 1;
char *p, *p1, *p2, *endp, *tmpstr;
@@ -421,7 +421,7 @@
/* {{{ MBSTRING_API php_mb_check_encoding_list */
MBSTRING_API int php_mb_check_encoding_list(const char *encoding_list TSRMLS_DC) {
- return php_mb_parse_encoding_list(encoding_list, strlen(encoding_list), NULL,
NULL, 0);
+ return php_mb_parse_encoding_list(encoding_list, strlen(encoding_list), NULL,
NULL, 0 TSRMLS_CC);
}
/* }}} */
@@ -535,7 +535,7 @@
{
int *list, size;
- if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1)) {
+ if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1
TSRMLS_CC)) {
if (MBSTRG(detect_order_list) != NULL) {
free(MBSTRG(detect_order_list));
}
@@ -554,7 +554,7 @@
{
int *list, size;
- if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1)) {
+ if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1
TSRMLS_CC)) {
if (MBSTRG(http_input_list) != NULL) {
free(MBSTRG(http_input_list));
}
@@ -632,7 +632,7 @@
{
int *list, size;
- if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1)) {
+ if (php_mb_parse_encoding_list(new_value, new_value_length, list, size, 1
TSRMLS_CC)) {
if (MBSTRG(script_encoding_list) != NULL) {
free(MBSTRG(script_encoding_list));
}
@@ -1272,7 +1272,7 @@
break;
default:
convert_to_string_ex(arg1);
- if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg1),
Z_STRLEN_PP(arg1), list, size, 0)) {
+ if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg1),
Z_STRLEN_PP(arg1), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
}
@@ -2516,7 +2516,7 @@
if (_from_encodings) {
list = NULL;
size = 0;
- php_mb_parse_encoding_list(_from_encodings, strlen(_from_encodings),
list, size, 0);
+ php_mb_parse_encoding_list(_from_encodings, strlen(_from_encodings),
list, size, 0 TSRMLS_CC);
if (size == 1) {
from_encoding = *list;
string.no_encoding = from_encoding;
@@ -2747,7 +2747,7 @@
break;
default:
convert_to_string_ex(arg_list);
- if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg_list),
Z_STRLEN_PP(arg_list), list, size, 0)) {
+ if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg_list),
Z_STRLEN_PP(arg_list), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
size = 0;
@@ -3045,7 +3045,7 @@
break;
default:
convert_to_string_ex(args[1]);
- php_mb_parse_encoding_list(Z_STRVAL_PP(args[1]), Z_STRLEN_PP(args[1]),
elist, elistsz, 0);
+ php_mb_parse_encoding_list(Z_STRVAL_PP(args[1]), Z_STRLEN_PP(args[1]),
elist, elistsz, 0 TSRMLS_CC);
break;
}
if (elistsz = 0) {
@@ -3637,9 +3637,10 @@
/* }}} */
/* {{{ MBSTRING_API int php_mb_gpc_encoding_converter() */
-MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, const char
*encoding_to, const char *encoding_from
+MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, int num, const
char *encoding_to,
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c /ext/mbstring/tests bug25140.phpt
derick Tue Aug 19 04:34:52 2003 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/mbstring/tests bug25140.phpt
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
- MFH: Fix for bug #25140 (mb_convert_encoding returns FALSE when it tries to
convert empty string)
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.24
php-src/ext/mbstring/mbstring.c:1.142.2.25
--- php-src/ext/mbstring/mbstring.c:1.142.2.24 Tue Aug 12 11:04:52 2003
+++ php-src/ext/mbstring/mbstring.c Tue Aug 19 04:34:51 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.24 2003/08/12 15:04:52 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.25 2003/08/19 08:34:51 derick Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -2625,7 +2625,7 @@
if (ret != NULL) {
RETVAL_STRINGL(ret, size, 0); /* the string is already
strdup()'ed */
} else {
- RETVAL_FALSE;
+ RETVAL_STRINGL(, 0, 1);
}
if ( s_free) {
efree(s_free);
Index: php-src/ext/mbstring/tests/bug25140.phpt
+++ php-src/ext/mbstring/tests/bug25140.phpt
--TEST--
Bug #25140 (mb_convert_encoding returns FALSE on an empty string)
--SKIPIF--
?php extension_loaded('mbstring') or die('skip mbstring not available'); ?
--FILE--
?php
var_dump( mb_convert_encoding( '', 'SJIS', 'EUC-JP' ) );
?
--EXPECT--
string(0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Tue Aug 19 10:32:11 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
Revert the last patch. This patch should not be included in the forthcoming
release.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.25
php-src/ext/mbstring/mbstring.c:1.142.2.26
--- php-src/ext/mbstring/mbstring.c:1.142.2.25 Tue Aug 19 04:34:51 2003
+++ php-src/ext/mbstring/mbstring.c Tue Aug 19 10:32:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.25 2003/08/19 08:34:51 derick Exp $ */
+/* $Id: mbstring.c,v 1.142.2.26 2003/08/19 14:32:10 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -2625,7 +2625,7 @@
if (ret != NULL) {
RETVAL_STRINGL(ret, size, 0); /* the string is already
strdup()'ed */
} else {
- RETVAL_STRINGL(, 0, 1);
+ RETVAL_FALSE;
}
if ( s_free) {
efree(s_free);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
On Tue, 19 Aug 2003, Moriyoshi Koizumi wrote: moriyoshi Tue Aug 19 10:32:11 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring mbstring.c Log: Revert the last patch. This patch should not be included in the forthcoming release. It wouldn't have been in there, as 4.3.3 final would be based on RC4 anyway... Derick -- Interpreting what the GPL actually means is a job best left to those that read the future by examining animal entrails. - Derick Rethans http://derickrethans.nl/ International PHP Magazine http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Tue Aug 19 10:49:40 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
MFH(r-1.189): more accurate fix for bug #25140
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.26
php-src/ext/mbstring/mbstring.c:1.142.2.27
--- php-src/ext/mbstring/mbstring.c:1.142.2.26 Tue Aug 19 10:32:10 2003
+++ php-src/ext/mbstring/mbstring.c Tue Aug 19 10:49:39 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.26 2003/08/19 14:32:10 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.27 2003/08/19 14:49:39 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -2485,7 +2485,7 @@
if (output_len) {
*output_len = 0;
}
- if ( !input || !length) {
+ if (!input) {
return NULL;
}
/* new encoding */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Sat Aug 9 02:12:41 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
MFH(r-1.186): fix wrong behaviour under ZTS that was inconsistent with the
behaviour under non-ZTS
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.22
php-src/ext/mbstring/mbstring.c:1.142.2.23
--- php-src/ext/mbstring/mbstring.c:1.142.2.22 Wed Aug 6 17:59:42 2003
+++ php-src/ext/mbstring/mbstring.c Sat Aug 9 02:12:41 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.22 2003/08/06 21:59:42 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.23 2003/08/09 06:12:41 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -516,48 +516,12 @@
static PHP_INI_MH(OnUpdate_mbstring_language)
{
enum mbfl_no_language no_language;
- char *default_enc = NULL;
no_language = mbfl_name2no_language(new_value);
- if (no_language != mbfl_no_language_invalid) {
- MBSTRG(language) = no_language;
- switch (no_language) {
- case mbfl_no_language_uni:
- default_enc = UTF-8;
- break;
- case mbfl_no_language_japanese:
- default_enc = EUC-JP;
- break;
- case mbfl_no_language_korean:
- default_enc = EUC-KR;
- break;
- case mbfl_no_language_simplified_chinese:
- default_enc = EUC-CN;
- break;
- case mbfl_no_language_traditional_chinese:
- default_enc = EUC-TW;
- break;
- case mbfl_no_language_russian:
- default_enc = KOI8-R;
- break;
- case mbfl_no_language_german:
- default_enc = ISO-8859-15;
- break;
- case mbfl_no_language_english:
- default:
- default_enc = ISO-8859-1;
- break;
- }
- MBSTRG(current_language) = MBSTRG(language);
- if (default_enc) {
- zend_alter_ini_entry(mbstring.internal_encoding,
-sizeof(mbstring.internal_encoding),
-default_enc, strlen(default_enc),
-PHP_INI_PERDIR, stage);
- }
- } else {
+ if (no_language == mbfl_no_language_invalid) {
return FAILURE;
}
+ MBSTRG(language) = no_language;
return SUCCESS;
}
/* }}} */
@@ -626,6 +590,9 @@
#if HAVE_MBREGEX
const struct def_mbctype_tbl *p = NULL;
#endif
+ if (new_value == NULL) {
+ return SUCCESS;
+ }
no_encoding = mbfl_name2no_encoding(new_value);
if (no_encoding != mbfl_no_encoding_invalid) {
@@ -723,7 +690,7 @@
PHP_INI_ENTRY(mbstring.detect_order, NULL, PHP_INI_ALL,
OnUpdate_mbstring_detect_order)
PHP_INI_ENTRY(mbstring.http_input, pass, PHP_INI_ALL,
OnUpdate_mbstring_http_input)
PHP_INI_ENTRY(mbstring.http_output, pass, PHP_INI_ALL,
OnUpdate_mbstring_http_output)
-PHP_INI_ENTRY(mbstring.internal_encoding, none, PHP_INI_ALL,
OnUpdate_mbstring_internal_encoding)
+PHP_INI_ENTRY(mbstring.internal_encoding, NULL, PHP_INI_ALL,
OnUpdate_mbstring_internal_encoding)
#ifdef ZEND_MULTIBYTE
PHP_INI_ENTRY(mbstring.script_encoding, NULL, PHP_INI_ALL,
OnUpdate_mbstring_script_encoding)
#endif /* ZEND_MULTIBYTE */
@@ -743,7 +710,7 @@
{
MBSTRG(language) = mbfl_no_language_uni;
MBSTRG(current_language) = MBSTRG(language);
- MBSTRG(internal_encoding) = mbfl_no_encoding_pass;
+ MBSTRG(internal_encoding) = mbfl_no_encoding_invalid;
MBSTRG(current_internal_encoding) = MBSTRG(internal_encoding);
#ifdef ZEND_MULTIBYTE
MBSTRG(script_encoding_list) = NULL;
@@ -878,6 +845,44 @@
const struct mb_overload_def *p;
MBSTRG(current_language) = MBSTRG(language);
+
+ if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
+ char *default_enc = NULL;
+ switch (MBSTRG(current_language)) {
+ case mbfl_no_language_uni:
+ default_enc = UTF-8;
+ break;
+ case mbfl_no_language_japanese:
+ default_enc = EUC-JP;
+ break;
+ case mbfl_no_language_korean:
+ default_enc = EUC-KR;
+ break;
+ case mbfl_no_language_simplified_chinese:
+
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
moriyoshi Wed Aug 6 17:59:43 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring mbstring.c Log: Add missing NLS entry for German. Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.142.2.21 php-src/ext/mbstring/mbstring.c:1.142.2.22 --- php-src/ext/mbstring/mbstring.c:1.142.2.21 Mon Jul 14 09:31:44 2003 +++ php-src/ext/mbstring/mbstring.c Wed Aug 6 17:59:42 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.142.2.21 2003/07/14 13:31:44 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.142.2.22 2003/08/06 21:59:42 moriyoshi Exp $ */ /* * PHP4 Multibyte String module mbstring @@ -539,6 +539,9 @@ break; case mbfl_no_language_russian: default_enc = KOI8-R; + break; + case mbfl_no_language_german: + default_enc = ISO-8859-15; break; case mbfl_no_language_english: default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
hirokawaMon Jul 14 09:31:44 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
fixed a typo.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.20
php-src/ext/mbstring/mbstring.c:1.142.2.21
--- php-src/ext/mbstring/mbstring.c:1.142.2.20 Sun Jul 13 03:34:28 2003
+++ php-src/ext/mbstring/mbstring.c Mon Jul 14 09:31:44 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.20 2003/07/13 07:34:28 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.21 2003/07/14 13:31:44 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3816,7 +3816,7 @@
string.no_language = MBSTRG(current_language);
string.val = (char*)arg_string;
string.len = arg_length;
- ret = mbfl_identify_encoding_name(string, elist, size TSRMLS_CC);
+ ret = mbfl_identify_encoding_name(string, elist, size, 0 TSRMLS_CC);
if (list != NULL) {
efree((void *)list);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
Err..same typo is in HEAD too. :)
--Jani
On Mon, 14 Jul 2003, Rui Hirokawa wrote:
hirokawa Mon Jul 14 09:31:44 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
fixed a typo.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.20
php-src/ext/mbstring/mbstring.c:1.142.2.21
--- php-src/ext/mbstring/mbstring.c:1.142.2.20 Sun Jul 13 03:34:28 2003
+++ php-src/ext/mbstring/mbstring.cMon Jul 14 09:31:44 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.20 2003/07/13 07:34:28 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.21 2003/07/14 13:31:44 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3816,7 +3816,7 @@
string.no_language = MBSTRG(current_language);
string.val = (char*)arg_string;
string.len = arg_length;
- ret = mbfl_identify_encoding_name(string, elist, size TSRMLS_CC);
+ ret = mbfl_identify_encoding_name(string, elist, size, 0 TSRMLS_CC);
if (list != NULL) {
efree((void *)list);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c
hirokawaSat Jun 28 07:00:37 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
deleted code for debuging.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.18
php-src/ext/mbstring/mbstring.c:1.142.2.19
--- php-src/ext/mbstring/mbstring.c:1.142.2.18 Sat Jun 28 04:51:05 2003
+++ php-src/ext/mbstring/mbstring.c Sat Jun 28 07:00:37 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.18 2003/06/28 08:51:05 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.19 2003/06/28 11:00:37 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3713,10 +3713,8 @@
encoding = mbfl_identify_encoding_no(string, elist, size TSRMLS_CC);
if (encoding != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify) = encoding;
- sapi_module.sapi_error(E_WARNING, encoding: %s %s, string.val, (char
*)mbfl_no_encoding2name(encoding));
return SUCCESS;
} else {
- sapi_module.sapi_error(E_WARNING, encoding detection failed: %s ,
string.val);
return FAILURE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
