com php-src: Merge branch 'PHP-7.2': ext/mbstring/php_unicode .c
| From: | Nikita Popov | Date: | Sun, 23 Jul 2017 13:36:25 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2': ext/mbstring/php_unicode .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98748@lists.php.net to get a copy of this message | ||
Commit: 7077c719db0b07dc0306390455a51e95eb5e904d
Author: Nikita Popov <nikita.ppv@gmail.com> Sun, 23 Jul 2017 15:36:25 +0200
Parents: 698132d6f981b118642a85e964a10f4721f903e4 077e61fad3c5fbdbe8df4371b88f64bcc4a6bccd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7077c719db0b07dc0306390455a51e95eb5e904d
Log:
Merge branch 'PHP-7.2'
Changed paths:
MM ext/mbstring/php_unicode.c
Diff:
diff --cc ext/mbstring/php_unicode.c
index 208c103,485988f..2baa469
--- a/ext/mbstring/php_unicode.c
+++ b/ext/mbstring/php_unicode.c
@@@ -161,9 -173,14 +162,9 @@@ MBSTRING_API unsigned long php_unicode_
/*
* The character is lower case.
*/
- field = 2;
+ field = 1;
l = _uccase_len[0];
- r = (l + _uccase_len[1]) - 3;
+ r = (l + _uccase_len[1]) - 1;
-
- if (enc == mbfl_no_encoding_8859_9) {
- return php_turkish_toupper(code, l, r, field);
- }
-
} else {
/*
* The character is title case.
@@@ -200,7 -206,12 +201,7 @@@ MBSTRING_API unsigned long php_unicode_
*/
field = 1;
l = 0;
- r = _uccase_len[0] - 3;
+ r = _uccase_len[0] - 1;
-
- if (enc == mbfl_no_encoding_8859_9) {
- return php_turkish_tolower(code, l, r, field);
- }
-
} else {
/*
* The character is title case.