[Pkg-php-commits] r1194 - in php5/trunk/debian: . patches

[Sean Finney]

Author: seanius
Date: 2009-01-11 19:40:50 +0000 (Sun, 11 Jan 2009)
New Revision: 1194

Added:
   php5/trunk/debian/patches/pdo-fetchobject-prototype-error.patch
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/series
Log:
backported fixes from 5.2.8, 1/2

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2009-01-11 19:19:36 UTC (rev 1193)
+++ php5/trunk/debian/changelog	2009-01-11 19:40:50 UTC (rev 1194)
@@ -6,6 +6,10 @@
   * Updated system tzdata patch from Joe Orton.
   * Removed tzdb-nofree_ents_ifnotzdata.patch, which is now incorporated
     into Joe's patch.
+  * Two backported fixes from 5.2.8, thanks to Olivier Bonvalet for looking
+    them up.
+    - Upstream bug #46157 (PDOStatement::fetchObject prototype error)
+      Patch: pdo-fetchobject-prototype-error.patch
   * Security related fixes:
     - Incorporate fix from 5.3 for proper initialization of uid/gid for
       apache2 sapi.

Added: php5/trunk/debian/patches/pdo-fetchobject-prototype-error.patch
===================================================================
--- php5/trunk/debian/patches/pdo-fetchobject-prototype-error.patch	                        (rev 0)
+++ php5/trunk/debian/patches/pdo-fetchobject-prototype-error.patch	2009-01-11 19:40:50 UTC (rev 1194)
@@ -0,0 +1,20 @@
+--- php5-5.2.6.dfsg.1.orig/ext/pdo/pdo_stmt.c
++++ php5-5.2.6.dfsg.1/ext/pdo/pdo_stmt.c
+@@ -46,7 +46,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatem
+ 	ZEND_ARG_INFO(0, orientation)
+ 	ZEND_ARG_INFO(0, offset)
+ ZEND_END_ARG_INFO()
+-ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchobject, 0, 0, 1)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchobject, 0, 0, 0)
+ 	ZEND_ARG_INFO(0, class_name)
+ 	ZEND_ARG_INFO(0, ctor_args) /* array */
+ ZEND_END_ARG_INFO()
+@@ -1365,7 +1365,7 @@ static PHP_METHOD(PDOStatement, fetch)
+ }
+ /* }}} */
+ 
+-/* {{{ proto mixed PDOStatement::fetchObject(string class_name [, NULL|array ctor_args])
++/* {{{ proto mixed PDOStatement::fetchObject([string class_name [, NULL|array ctor_args]])
+    Fetches the next row and returns it as an object. */
+ static PHP_METHOD(PDOStatement, fetchObject)
+ {

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2009-01-11 19:19:36 UTC (rev 1193)
+++ php5/trunk/debian/patches/series	2009-01-11 19:40:50 UTC (rev 1194)
@@ -40,3 +40,4 @@
 CVE-2008-3660.patch
 BG-initializing-fix.patch
 CVE-2008-5557.patch
+pdo-fetchobject-prototype-error.patch