From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 22 Jul 2018 16:04:12 +0000 (+0200)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0beta1~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89e2202cb5e8a2308055d22122375f72c479e108;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix #52974: jewish.c: compile error under Windows with GBK charset
---

89e2202cb5e8a2308055d22122375f72c479e108
diff --cc NEWS
index c67874e748,1f0b002bdb..bfcb52da26
--- a/NEWS
+++ b/NEWS
@@@ -1,21 -1,12 +1,25 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.9
 +?? ??? ????, PHP 7.3.0beta1
 +
 +19 Jul 2018, PHP 7.3.0alpha4
 +
 +- Core:
 +  . Fixed bug #33502 (Some nullary functions don't check the number of
 +    arguments). (cmb)
 +  . Fixed bug #76392 (Error relocating sapi/cli/php: unsupported relocation
 +    type 37). (Peter Kokot)
 +  . The declaration and use of case-insensitive constants has been deprecated.
 +    (Nikita)
 +  . Added syslog.filter INI entry for syslog filtering. (Philip Prindeville)
  
+ - Calendar:
+   . Fixed bug #52974 (jewish.c: compile error under Windows with GBK charset).
+     (cmb)
+ 
  - Filter:
 +  . Added the 'add_slashes' sanitization mode (FILTER_SANITIZE_ADD_SLASHES). 
 +	(Kalle)
    . Fixed bug #76366 (References in sub-array for filtering breaks the filter).
      (ZiHang Gao)
  
diff --cc ext/calendar/jewish.c
index f5cd1b18c2,61c3c22299..07284ed8c2
--- a/ext/calendar/jewish.c
+++ b/ext/calendar/jewish.c
@@@ -337,41 -337,41 +337,41 @@@ const char * const JewishMonthName[14] 
  };
  
  /* names for leap (13-month) year */
 -char *JewishMonthHebNameLeap[14] =
 +const char * const JewishMonthHebNameLeap[14] =
  {
 -	"", 
 +	"",
- 	"úùøé",
- 	"çùåï",
- 	"ëñìå",
- 	"èáú",
- 	"ùáè",
- 	"àãø à'",
- 	"àãø á'",
- 	"ðéñï",
- 	"àééø",
- 	"ñéåï",
- 	"úîåæ",
- 	"àá",
- 	"àìåì"
+ 	"\xFA\xF9\xF8\xE9",
+ 	"\xE7\xF9\xE5\xEF",
+ 	"\xEB\xF1\xEC\xE5",
+ 	"\xE8\xE1\xFA",
+ 	"\xF9\xE1\xE8",
+ 	"\xE0\xE3\xF8 \xE0'",
+ 	"\xE0\xE3\xF8 \xE1'",
+ 	"\xF0\xE9\xF1\xEF",
+ 	"\xE0\xE9\xE9\xF8",
+ 	"\xF1\xE9\xe5\xEF",
+ 	"\xFA\xEE\xE5\xE6",
+ 	"\xE0\xE1",
+ 	"\xE0\xEC\xE5\xEC"
  };
  
  /* names for regular year */
 -char *JewishMonthHebName[14] =
 +const char * const JewishMonthHebName[14] =
  {
 -	"", 
 +	"",
- 	"úùøé",
- 	"çùåï",
- 	"ëñìå",
- 	"èáú",
- 	"ùáè",
+ 	"\xFA\xF9\xF8\xE9",
+ 	"\xE7\xF9\xE5\xEF",
+ 	"\xEB\xF1\xEC\xE5",
+ 	"\xE8\xE1\xFA",
+ 	"\xF9\xE1\xE8",
  	"",
- 	"àãø",
- 	"ðéñï",
- 	"àééø",
- 	"ñéåï",
- 	"úîåæ",
- 	"àá",
- 	"àìåì"
+ 	"\xE0\xE3\xF8",
+ 	"\xF0\xE9\xF1\xEF",
+ 	"\xE0\xE9\xE9\xF8",
+ 	"\xF1\xE9\xE5\xEF",
+ 	"\xFA\xEE\xE5\xE6",
+ 	"\xE0\xE1",
+ 	"\xE0\xEC\xE5\xEC"
  };
  
  /************************************************************************