Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
Moriyoshi Koizumi wrote: > moriyoshi Fri Sep 12 23:59:51 2008 UTC > > Modified files: > /php-src/ext/mbstring mbstring.c > Log: > - The mb_list_* issue has been resolved in the following way: > - Keep the same prototype as 5.2 for mb_list_encodings(). > - Add mb_list_encoding_aliases() with the mandatory parameter. > - Remove mb_list_mime_names() as the list can be made from iteration > on mb_list_encodings() with mb_preferred_mime_name(). > Just to note I already discussed this with the other mbstring developers. Thanks Nuno for reminding me. Regards, Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
On 11.08.2008 19:40, Nuno Lopes wrote: #include #undef UChar #elif HAVE_PCRE || HAVE_BUNDLED_PCRE -#include +#include "ext/pcre/php_pcre.h" #endif Right, I didn't notice that =) Thanks. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h
Hi, Derick. > Just wondering... but why are you adding mb_String functions to HEAD? > PHP in HEAD has full unicode support which makes the mbstring extension > obsolete. PHP_5_1 Branch is release process. If PHP5.1.3 is released, it will be applied to PHP_5_1 Branch. Can't think that all application can shift to the Unicode at once. Thank you. -- Seiji Masugata -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h
On Thu, 30 Mar 2006, Seiji Masugata wrote: > masugata Thu Mar 30 15:43:54 2006 UTC > > Modified files: > /php-src/ext/mbstring mbstring.c mbstring.h > Log: > added mb_stripos( ), mb_strripos( ). Just wondering... but why are you adding mb_String functions to HEAD? PHP in HEAD has full unicode support which makes the mbstring extension obsolete. regards, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c /ext/mbstring/tests bug26639.phpt
On 2003/12/19, at 0:12, Andi Gutmans wrote:
Shouldn't you be using some SEPARATE*() macro here? It seems as if
you're doing something like that.
I didn't try to use that macro because a zval_copy_ctor() call in it
would
be redundant in this case. It seems REPLACE_ZVAL_VALUE() is a more
suitable
macro for this purpose.
Moriyoshi
+if ((*hash_entry)->refcount > 1) {
+ZVAL_DELREF(*hash_entry);
+MAKE_STD_ZVAL(*hash_entry);
+} else {
+zval_dtor(*hash_entry);
+}
+ZVAL_STRINGL(*hash_entry, ret->val, ret->len, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c /ext/mbstring/tests bug26639.phpt
Shouldn't you be using some SEPARATE*() macro here? It seems as if you're
doing something like that.
At 09:50 AM 12/18/2003 +, Moriyoshi Koizumi wrote:
moriyoshi Thu Dec 18 04:50:21 2003 EDT
Added files:
/php-src/ext/mbstring/tests bug26639.phpt
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
Fix bug #26639 (mb_convert_variables() clutters variables beyond the
references)
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.205
php-src/ext/mbstring/mbstring.c:1.206
--- php-src/ext/mbstring/mbstring.c:1.205 Wed Dec 10 12:38:45 2003
+++ php-src/ext/mbstring/mbstring.c Thu Dec 18 04:50:19 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.205 2003/12/10 17:38:45 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.206 2003/12/18 09:50:19 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -2605,9 +2605,13 @@
string.len =
Z_STRLEN_PP(hash_entry);
ret =
mbfl_buffer_converter_feed_result(convd, &string, &result);
if (ret != NULL) {
-
STR_FREE(Z_STRVAL_PP(hash_entry));
-
Z_STRVAL_PP(hash_entry) = (char *)ret->val;
-
Z_STRLEN_PP(hash_entry) = ret->len;
+ if
((*hash_entry)->refcount > 1) {
+
ZVAL_DELREF(*hash_entry);
+
MAKE_STD_ZVAL(*hash_entry);
+ } else {
+
zval_dtor(*hash_entry);
+ }
+
ZVAL_STRINGL(*hash_entry, ret->val, ret->len, 0);
}
}
}
@@ -2617,9 +2621,8 @@
string.len = Z_STRLEN_PP(var);
ret =
mbfl_buffer_converter_feed_result(convd, &string, &result);
if (ret != NULL) {
- STR_FREE(Z_STRVAL_PP(var));
- Z_STRVAL_PP(var) = (char *)ret->val;
- Z_STRLEN_PP(var) = ret->len;
+ zval_dtor(*var);
+ ZVAL_STRINGL(*var, ret->val,
ret->len, 0);
}
}
}
Index: php-src/ext/mbstring/tests/bug26639.phpt
+++ php-src/ext/mbstring/tests/bug26639.phpt
--TEST--
Bug #26639 (mb_convert_variables() clutters variables beyond the references)
--SKIPIF--
--FILE--
$a = " ¢¤¦¨";
$b = &$a;
mb_convert_variables("EUC-JP", "Shift_JIS", $b);
debug_zval_dump($a);
debug_zval_dump($b);
unset($a);
unset($b);
$a = " ¢¤¦¨";
$b = array($a);
$c = $b;
mb_convert_variables("EUC-JP", "Shift_JIS", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
$a = " ¢¤¦¨";
$b = array(&$a);
$c = $b;
mb_convert_variables("euc-jp", "shift_jis", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
$a = " ¢¤¦¨";
$b = array($a);
$c = &$b;
mb_convert_variables("euc-jp", "shift_jis", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
$a = " ¢¤¦¨";
$b = array(&$a);
$c = &$b;
mb_convert_variables("euc-jp", "shift_jis", $c);
debug_zval_dump($b);
debug_zval_dump($c);
unset($a);
unset($b);
unset($c);
?>
--EXPECT--
string(10) " ¢¤¦¨" refcount(2)
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(2)
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(1)
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(1)
array(1) refcount(2){
[0]=>
string(10) " ¢¤¦¨" refcount(2)
}
array(1) refcount(2){
[0]=>
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(1)
}
array(1) refcount(2){
[0]=>
&string(10) " ¢¤¦¨" refcount(2)
}
array(1) refcount(2){
[0]=>
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(1)
}
array(1) refcount(1){
[0]=>
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(2)
}
array(1) refcount(1){
[0]=>
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(2)
}
array(1) refcount(1){
[0]=>
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(2)
}
array(1) refcount(1){
[0]=>
string(10) "¤¢¤¤¤¦¤¨¤ª" refcount(2)
}
--
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 /ext/mbstring mbstring.c
On Tue, Nov 11, 2003 at 05:35:33PM -, Moriyoshi Koizumi wrote: > moriyoshi Tue Nov 11 12:35:33 2003 EDT > > Modified files: > /php-src/ext/mbstring mbstring.c > Log: > Compiler warning fix (patch by Joe Orton) The fix is needed on the 4.3 branch too BTW. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
On October 26, 2003 02:20 am, Rui Hirokawa wrote: > But, I shoudn't revert an another license related patch > as shown below because the license compatibility has priority. There is no argument about the license fix patch, it is a necessary evil. I will make RC3 on Monday with this patch and if no bugs appear, go forth with 4.3.4 final 1 week from Monday. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h/main rfc1867.c
Moriyoshi, Yes, there was a temporary agreement that allows us to release the current version in the 4.3 branch until new implementation has stability. But, I think replacing libmbfl with mbfilter.* in PHP 4.3.4 is preferable because, 1. license problem should be solved as quickly as possible. 2. The differences of libmbfl and the current implementation are quite small because the new implementation is based on the current implementation. 3. the new implementation with libmbfl is well tested in PHP 5 since last August. 4. the new implementation was already confirmed to pass the all unit tests in ext/mbstring/tests/*. Rui On Sun, 26 Oct 2003 16:31:06 +0900 Moriyoshi Koizumi <[EMAIL PROTECTED]> wrote: > Rui, wasn't there any agreement with the author of libmbfl that still > allows us to keep the modified version in the 4.3 branch? Unless there's > something obvious, we'd be better off replacing them by the safer stuff > however. > > Moriyoshi > > Rui Hirokawa <[EMAIL PROTECTED]> wrote: > > > > > Ilia, > > > > I appreciate your continious effort about QC process. > > GPC bug in rfc1867.c is not critical one, and I agree with you > > it is not preferable in the final RC process. > > I will revert my GPC related patch in a couple of hours. > > > > But, I shoudn't revert an another license related patch > > as shown below because the license compatibility has priority. -- Rui Hirokawa <[EMAIL PROTECTED]> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h/main rfc1867.c
Rui, wasn't there any agreement with the author of libmbfl that still allows us to keep the modified version in the 4.3 branch? Unless there's something obvious, we'd be better off replacing them by the safer stuff however. Moriyoshi Rui Hirokawa <[EMAIL PROTECTED]> wrote: > > Ilia, > > I appreciate your continious effort about QC process. > GPC bug in rfc1867.c is not critical one, and I agree with you > it is not preferable in the final RC process. > I will revert my GPC related patch in a couple of hours. > > But, I shoudn't revert an another license related patch > as shown below because the license compatibility has priority. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
Ilia, I appreciate your continious effort about QC process. GPC bug in rfc1867.c is not critical one, and I agree with you it is not preferable in the final RC process. I will revert my GPC related patch in a couple of hours. But, I shoudn't revert an another license related patch as shown below because the license compatibility has priority. +2003-10-25 Rui Hirokawa <[EMAIL PROTECTED]> + +* (PHP_4_3) + ext/mbstring/mbstring.dsp: + fixed windows build. + +* (PHP_4_3) + ext/mbstring/README.libmbfl + ext/mbstring/config.m4 + ext/mbstring/cp932_table.h + ext/mbstring/html_entities.c + ext/mbstring/mbfilter.c + ext/mbstring/mbfilter.h + ext/mbstring/mbfilter_cn.c + ext/mbstring/mbfilter_cn.h + ext/mbstring/mbfilter_ja.c + ext/mbstring/mbfilter_ja.h + ext/mbstring/mbfilter_kr.c + ext/mbstring/mbfilter_kr.h + ext/mbstring/mbfilter_ru.c + ext/mbstring/mbfilter_ru.h + ext/mbstring/mbfilter_tw.c + ext/mbstring/mbfilter_tw.h + ext/mbstring/mbregex.c + ext/mbstring/mbregex.h + ext/mbstring/mbstring.c + ext/mbstring/mbstring.dsp + ext/mbstring/mbstring.h + ext/mbstring/unicode_table.h + ext/mbstring/unicode_table_cn.h + ext/mbstring/unicode_table_ja.h + ext/mbstring/unicode_table_kr.h + ext/mbstring/unicode_table_ru.h + ext/mbstring/unicode_table_tw.h: + mbfilter is replaced with libmbfl to maintain the licence compatibility. + mbregex.[ch] is moved to mbregex/ for the same reason. + On Sun, 26 Oct 2003 00:46:29 -0400 Ilia Alshanetsky <[EMAIL PROTECTED]> wrote: > On October 25, 2003 07:14 pm, Rasmus Lerdorf wrote: > > Ah, thought it was the other patch. However, I wouldn't call the above a > > new feature. That one is a bug fix as it was an oversight to not also > > convert form fields in multipart posts. > > Well, it is a mix of a feature & a bug fix. The bug if we decide to call it > such is by no means critical and 2 days before the release time is not a time > to make any non critical changes simply because there is no time to test > them. rfc1867.c is very sensitive code which previously had a number of > security faults at least 1 directly caused by mbstring related changes. It is > my opinion such changes have no place this late in the release cycle. > > Ilia -- Rui Hirokawa <[EMAIL PROTECTED]> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h/main rfc1867.c
Ilia Alshanetsky <[EMAIL PROTECTED]> wrote: > On October 25, 2003 07:14 pm, Rasmus Lerdorf wrote: > > Ah, thought it was the other patch. However, I wouldn't call the above a > > new feature. That one is a bug fix as it was an oversight to not also > > convert form fields in multipart posts. > > Well, it is a mix of a feature & a bug fix. The bug if we decide to call it > such is by no means critical and 2 days before the release time is not a time > to make any non critical changes simply because there is no time to test I kind of agree with Ilia here. It'd be a bad idea to have GPC-related patch during the RC period, although the modified parts are all companied with #ifdef's as far as I'm concerned. > them. rfc1867.c is very sensitive code which previously had a number of > security faults at least 1 directly caused by mbstring related changes. It is > my opinion such changes have no place this late in the release cycle. Just want to make it clear, the past problem you mentioned related to mbstring is not a security fault, you know. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
On October 25, 2003 07:14 pm, Rasmus Lerdorf wrote: > Ah, thought it was the other patch. However, I wouldn't call the above a > new feature. That one is a bug fix as it was an oversight to not also > convert form fields in multipart posts. Well, it is a mix of a feature & a bug fix. The bug if we decide to call it such is by no means critical and 2 days before the release time is not a time to make any non critical changes simply because there is no time to test them. rfc1867.c is very sensitive code which previously had a number of security faults at least 1 directly caused by mbstring related changes. It is my opinion such changes have no place this late in the release cycle. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
I think it is a kind of bug fix because, 1. name field of multipart/form was not converted into internal encoding. This behavior is different from the usual GPC conversion performed by mbstr_treat_data() and it might makes confusion for the users. 2. auto-detection might be fail because auto-detection was performed per variables. It should be performed using the whole form data as in mbstr_treat_data(). 3. form field was converted into internal encoding even if mbstring.http_input is set to 'pass'. 4.auto detection was performed even if mbstring.http_input is set to 'pass' or any valid encoding . And the license fix is an another patch as Rasmus said. Rui On Sat, 25 Oct 2003 18:36:41 -0400 Ilia Alshanetsky <[EMAIL PROTECTED]> wrote: > On October 25, 2003 06:22 pm, Rasmus Lerdorf wrote: > > And continue breaking licenses knowingly? > > That patch does not fix licensing issues, it merely adds a feature, the > license fix is not there... > > Patch log: > name/value in multipart/form-date will be converted into internal encoding > when mbstring.encoding_translation is On. > > Ilia -- Rui Hirokawa <[EMAIL PROTECTED]> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
On Sat, 25 Oct 2003, Ilia Alshanetsky wrote: > On October 25, 2003 06:22 pm, Rasmus Lerdorf wrote: > > And continue breaking licenses knowingly? > > That patch does not fix licensing issues, it merely adds a feature, the > license fix is not there... > > Patch log: > name/value in multipart/form-date will be converted into internal encoding > when mbstring.encoding_translation is On. Ah, thought it was the other patch. However, I wouldn't call the above a new feature. That one is a bug fix as it was an oversight to not also convert form fields in multipart posts. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
On October 25, 2003 06:22 pm, Rasmus Lerdorf wrote: > And continue breaking licenses knowingly? That patch does not fix licensing issues, it merely adds a feature, the license fix is not there... Patch log: name/value in multipart/form-date will be converted into internal encoding when mbstring.encoding_translation is On. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
And continue breaking licenses knowingly? On Sat, 25 Oct 2003, Ilia Alshanetsky wrote: > My appologies for the delayed response (I see that the patch was commited). > After reviewing the patch I would very much prefer if you would revert it and > wait till PHP 4.3.5 (ot whatever the next release will be) with it. > > Ilia > > On October 24, 2003 11:08 pm, Rui Hirokawa wrote: > > Yes, I have plan to commit to 4.3 branch. > > Ilia, is it possible to commit ? > > > > Rui > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
My appologies for the delayed response (I see that the patch was commited). After reviewing the patch I would very much prefer if you would revert it and wait till PHP 4.3.5 (ot whatever the next release will be) with it. Ilia On October 24, 2003 11:08 pm, Rui Hirokawa wrote: > Yes, I have plan to commit to 4.3 branch. > Ilia, is it possible to commit ? > > Rui -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
Yes, I have plan to commit to 4.3 branch. Ilia, is it possible to commit ? Rui On Thu, 23 Oct 2003 10:43:16 +0900 (JST) Rasmus Lerdorf <[EMAIL PROTECTED]> wrote: > Are you committing this to 4.3 as well? > > On Wed, 22 Oct 2003, Rui Hirokawa wrote: > > > hirokawaWed Oct 22 10:14:06 2003 EDT > > > > Modified files: > > /php-src/main rfc1867.c > > /php-src/ext/mbstring mbstring.c mbstring.h > > Log: > > name/value in multipart/form-date will be converted into internal encoding when > > mbstring.encoding_translation is On. > > -- Rui Hirokawa <[EMAIL PROTECTED]> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /main rfc1867.c
Are you committing this to 4.3 as well? On Wed, 22 Oct 2003, Rui Hirokawa wrote: > hirokawa Wed Oct 22 10:14:06 2003 EDT > > Modified files: > /php-src/main rfc1867.c > /php-src/ext/mbstring mbstring.c mbstring.h > Log: > name/value in multipart/form-date will be converted into internal encoding when > mbstring.encoding_translation is On. > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
