From 02a6ecd690bc1d214c0c8e2ab38dbf82e7f717de Mon Sep 17 00:00:00 2001
From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 1 Aug 2016 21:37:18 +0100
Subject: [PATCH 1/2] Go with 2.4.1

---
 package.xml  | 60 ++++++++++++++++++++++++++++++++++++++++------------
 php_xdebug.h |  2 +-
 template.rc  |  4 ++--
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/package.xml b/package.xml
index b6ee15a8e..37db6f05e 100644
--- a/package.xml
+++ b/package.xml
@@ -33,11 +33,11 @@ Xdebug also provides:
   <active>yes</active>
  </lead>
 
- <date>2016-03-03</date>
- <time>08:47:08</time>
+ <date>2016-08-02</date>
+ <time>11:47:08</time>
  <version>
-  <release>2.4.0</release>
-  <api>2.4.0</api>
+  <release>2.4.1</release>
+  <api>2.4.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -45,18 +45,24 @@ Xdebug also provides:
  </stability>
  <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD style</license>
  <notes>
-Thu, Mar 03, 2016 - xdebug 2.4.0
+Tue, Aug 02, 2016 - xdebug 2.4.1
 
 = Fixed bugs:
 
-  - Fixed issue #1258: Case in PHP 7.0 and code coverage
-  - Fixed issue #1261: segmentation fault in xdebug.so with PHP 7.0 version of
-    'pkgtools' due to spl_autoload()
-  - Fixed issue #1262: overload_var_dump=0 messes with xdebug_var_dump()
-  - Fixed issue #1266: xdebug_dump_superglobals() always dumps empty  stack on
-    PHP 7
-  - Fixed issue #1267: AIX build issues
-  - Fixed issue #1270: String parsing marked not covered with PHP 7
+  - Fixed issue #1106: A thrown Exception after a class with __debugInfo gives
+    2 errors
+  - Fixed issue #1241: FAST_CALL/FAST_RET take #2
+  - Fixed issue #1246: Path and branch coverage should be initialised per
+    request, not globally
+  - Fixed issue #1263: Code coverage segmentation fault with opcache enabled
+  - Fixed issue #1277: Crash when using a userland function from RSHUTDOWN with
+    profiling enabled
+  - Fixed issue #1282: var_dump() of integers > 32 bit is broken on Windows
+  - Fixed issue #1288: Segfault when uncaught exception message does not
+    contain " in "
+  - Fixed issue #1291: Debugclient installation fails on Mac OS X
+  - Fixed issue #1326: Tracing and generators crashes with PHP 7.x
+  - Fixed issue #1333: Profiler accesses memory structures after freeing
  </notes>
 
  <contents>
@@ -164,6 +170,34 @@ Thu, Mar 03, 2016 - xdebug 2.4.0
  <zendextsrcrelease />
  <changelog>
 
+  <release>
+   <date>2016-03-03</date>
+   <time>08:47:08</time>
+   <version>
+    <release>2.4.0</release>
+    <api>2.4.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD style</license>
+   <notes>
+Thu, Mar 03, 2016 - xdebug 2.4.0
+
+= Fixed bugs:
+
+  - Fixed issue #1258: Case in PHP 7.0 and code coverage
+  - Fixed issue #1261: segmentation fault in xdebug.so with PHP 7.0 version of
+    'pkgtools' due to spl_autoload()
+  - Fixed issue #1262: overload_var_dump=0 messes with xdebug_var_dump()
+  - Fixed issue #1266: xdebug_dump_superglobals() always dumps empty  stack on
+    PHP 7
+  - Fixed issue #1267: AIX build issues
+  - Fixed issue #1270: String parsing marked not covered with PHP 7
+   </notes>
+  </release>
+
   <release>
    <date>2016-01-25</date>
    <time>20:48:33</time>
diff --git a/php_xdebug.h b/php_xdebug.h
index 2952664be..7eb23a940 100644
--- a/php_xdebug.h
+++ b/php_xdebug.h
@@ -20,7 +20,7 @@
 #define PHP_XDEBUG_H
 
 #define XDEBUG_NAME       "Xdebug"
-#define XDEBUG_VERSION    "2.4.1-dev"
+#define XDEBUG_VERSION    "2.4.1"
 #define XDEBUG_AUTHOR     "Derick Rethans"
 #define XDEBUG_COPYRIGHT  "Copyright (c) 2002-2016 by Derick Rethans"
 #define XDEBUG_COPYRIGHT_SHORT "Copyright (c) 2002-2016"
diff --git a/template.rc b/template.rc
index f234ae8ff..a9fb9d925 100644
--- a/template.rc
+++ b/template.rc
@@ -15,8 +15,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 # define THANKS_GUYS ""
 #endif
 
-#define VERSIONDESC 2,4,1,0
-#define VERSIONSTR  "2.4.1-dev"
+#define VERSIONDESC 2,4,1,1
+#define VERSIONSTR  "2.4.1"
 
 //Version
 VS_VERSION_INFO VERSIONINFO

From e425ec3bae879c557f18fe1d1c5e09cf07193670 Mon Sep 17 00:00:00 2001
From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 2 Aug 2016 10:56:35 +0100
Subject: [PATCH 2/2] back to -dev

---
 php_xdebug.h | 2 +-
 template.rc  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/php_xdebug.h b/php_xdebug.h
index 7eb23a940..7fa8dfd51 100644
--- a/php_xdebug.h
+++ b/php_xdebug.h
@@ -20,7 +20,7 @@
 #define PHP_XDEBUG_H
 
 #define XDEBUG_NAME       "Xdebug"
-#define XDEBUG_VERSION    "2.4.1"
+#define XDEBUG_VERSION    "2.4.2-dev"
 #define XDEBUG_AUTHOR     "Derick Rethans"
 #define XDEBUG_COPYRIGHT  "Copyright (c) 2002-2016 by Derick Rethans"
 #define XDEBUG_COPYRIGHT_SHORT "Copyright (c) 2002-2016"
diff --git a/template.rc b/template.rc
index a9fb9d925..ed0308302 100644
--- a/template.rc
+++ b/template.rc
@@ -15,8 +15,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 # define THANKS_GUYS ""
 #endif
 
-#define VERSIONDESC 2,4,1,1
-#define VERSIONSTR  "2.4.1"
+#define VERSIONDESC 2,4,2,0
+#define VERSIONSTR  "2.4.2-dev"
 
 //Version
 VS_VERSION_INFO VERSIONINFO