From f0120ff8787ce5efc509a8365fd815d1144c366e Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Tue, 29 Mar 2016 18:11:03 +0200
Subject: 5.5.35 now

---
 NEWS               | 22 +++++++++++++++++++++-
 configure.in       |  2 +-
 main/php_version.h |  6 +++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 6d3caf60de..8859d6c57c 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,29 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ** PHP 5.5 is in security-only mode , please do not commit to this branch **
 
-??? 2016, PHP 5.5.34
+??? 2016, PHP 5.5.35
 
+31 Mar 2016, PHP 5.5.34
 
+- Fileinfo:
+  . Fixed bug #71527 (Buffer over-write in finfo_open with malformed magic
+    file). (Anatol)
+
+- Mbstring:
+  . Fixed bug #71906 (AddressSanitizer: negative-size-param (-1) in
+    mbfl_strcut). (Stas)
+
+- OBBC
+  . Fixed bug #71860 (Invalid memory write in phar on filename with \0 in
+    name). (Stas)
+
+- SNMP:
+  . Fixed bug #71704 (php_snmp_error() Format String Vulnerability).
+    (andrew at jmpesp dot org)
+
+- Standard
+  . Fixed bug #71798 (Integer Overflow in php_raw_url_encode).
+    (taoguangchen at icloud dot com, Stas)
 
 03 Mar 2016, PHP 5.5.33
 
diff --git a/configure.in b/configure.in
index 21a52065c5..c46011a30d 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=34
+PHP_RELEASE_VERSION=35
 PHP_EXTRA_VERSION="-dev"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 25446e3d65..f87cc38eda 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 34
+#define PHP_RELEASE_VERSION 35
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.34-dev"
-#define PHP_VERSION_ID 50534
+#define PHP_VERSION "5.5.35-dev"
+#define PHP_VERSION_ID 50535
-- 
cgit v1.2.1