From: Anatol Belski <ab@php.net>
Date: Sat, 6 Dec 2014 11:01:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d68d843cb21d7147164dd4599e99afb456790c8;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #65230 setting locale randomly broken
---

3d68d843cb21d7147164dd4599e99afb456790c8
diff --cc ext/standard/formatted_print.c
index f84075440b,a21bfebe42..2efd16247f
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@@ -208,10 -216,13 +212,14 @@@ php_sprintf_appenddouble(zend_string **
  {
  	char num_buf[NUM_BUF_SIZE];
  	char *s = NULL;
 -	int s_len = 0, is_negative = 0;
 +	size_t s_len = 0;
 +	int is_negative = 0;
  #ifdef HAVE_LOCALE_H
+ #ifdef ZTS
+ 	struct lconv lconv;
+ #else
  	struct lconv *lconv;
+ #endif
  #endif
  
  	PRINTF_DEBUG(("sprintf: appenddouble(%x, %x, %x, %f, %d, '%c', %d, %c)\n",