From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 26 Apr 2015 10:04:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a4d3e4855619538eb1902b8513473e2cda76804;p=php

Merge branch 'PHP-5.6'
---

1a4d3e4855619538eb1902b8513473e2cda76804
diff --cc ext/date/lib/parse_tz.c
index 0205aaf2da,4350b3a984..1d873fad6a
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@@ -49,11 -49,14 +49,14 @@@
  #define timelib_conv_int(l) ((l & 0x000000ff) << 24) + ((l & 0x0000ff00) << 8) + ((l & 0x00ff0000) >> 8) + ((l & 0xff000000) >> 24)
  #endif
  
- static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+ static int read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
  {
- 	/* skip ID */
+ 	uint32_t version;
+ 
+ 	/* read ID */
+ 	version = (*tzf)[3] - '0';
  	*tzf += 4;
 -	
 +
  	/* read BC flag */
  	tz->bc = (**tzf == '\1');
  	*tzf += 1;