Merge branch 'PHP-5.6'

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

diff --cc ext/standard/formatted_print.c
index f84075440bd142e6dc9de4d145c1b113bd379ffc,a21bfebe42ba4dc94628920d3b8ec5c02cc4a87b..2efd16247f201cce7b5d21c4c452c9b2fb71d2af
--- 1/ext/standard/formatted_print.c
--- 2/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",

diff --cc main/snprintf.c
Simple merge

diff --cc main/spprintf.c
Simple merge