From 0d0834a5b415a6f9b64d738fa09521fb11c8600d Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 16 Jul 2014 11:13:55 +0200
Subject: php 5.5.14 + upstream patch for #67605

---
 php-intl.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 php-intl.patch

(limited to 'php-intl.patch')

diff --git a/php-intl.patch b/php-intl.patch
new file mode 100644
index 0000000..182e2ef
--- /dev/null
+++ b/php-intl.patch
@@ -0,0 +1,20 @@
+--- php-5.5.14/ext/intl/locale/locale_methods.c	2014-06-25 15:06:23.000000000 +0200
++++ php-5.5.15RC1/ext/intl/locale/locale_methods.c	2014-07-08 23:55:31.000000000 +0200
+@@ -279,7 +279,7 @@
+ 	if( fromParseLocale==1 ){
+ 		/* Handle singletons */
+ 		if( strcmp(tag_name , LOC_LANG_TAG)==0 ){
+-			if( strlen(loc_name)>1 && isIDPrefix(loc_name) ){
++			if( strlen(loc_name)>1 && (isIDPrefix(loc_name) == 1) ){
+ 				return estrdup(loc_name);
+ 			}
+ 		}
+@@ -506,7 +506,7 @@
+     }
+ 
+ 	if(loc_name_len == 0) {
+-		loc_name = INTL_G(default_locale);
++		loc_name = intl_locale_get_default(TSRMLS_C);
+ 	}
+ 
+ 	if( strcmp(tag_name, DISP_NAME) != 0 ){
-- 
cgit