From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 23 Jul 2017 13:36:25 +0000 (+0200)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1820
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7077c719db0b07dc0306390455a51e95eb5e904d;p=php

Merge branch 'PHP-7.2'
---

7077c719db0b07dc0306390455a51e95eb5e904d
diff --cc ext/mbstring/php_unicode.c
index 208c10319e,485988fe35..2baa4690c9
--- 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.