rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed May 9 2007 Joe Orton <jorton@redhat.com> 5.2.2-4

Browse Source 
- fix php-pdo *_arg_force_ref global symbol abuse (#216125)
This commit is contained in:
jorton 2007-05-09 16:42:21 +00:00
parent db22cd8391
commit 695917a253
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
php-5.2.2-pdosym.patch Normal file
View File

@ -0,0 +1,41 @@
--- php-5.2.2/ext/pdo/pdo_stmt.c.pdosym
+++ php-5.2.2/ext/pdo/pdo_stmt.c
@@ -37,38 +37,6 @@
#include "zend_interfaces.h"
#include "php_memory_streams.h"
-#if COMPILE_DL_PDO
-/* {{{ content from zend_arg_defs.c:
- * since it is a .c file, it won't be installed for use by PECL extensions, so we include it here. */
-ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0)
- ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO()
-
-
-ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO()
-
-
-ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1)
-ZEND_END_ARG_INFO()
-/* }}} */
-#endif
-
#define PHP_STMT_GET_OBJ \
pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis() TSRMLS_CC); \
if (!stmt->dbh) { \

9
php.spec
View File

@ -6,7 +6,7 @@
Summary: The PHP HTML-embedded scripting language Summary: The PHP HTML-embedded scripting language
Name: php Name: php
Version: 5.2.2 Version: 5.2.2
Release: 3 Release: 4
License: The PHP License v3.01 License: The PHP License v3.01
Group: Development/Languages Group: Development/Languages
URL: http://www.php.net/ URL: http://www.php.net/
@ -25,6 +25,7 @@ Patch8: php-5.2.0-includedir.patch
# Fixes for extension modules # Fixes for extension modules
Patch21: php-4.3.1-odbc.patch Patch21: php-4.3.1-odbc.patch
Patch22: php-4.3.11-shutdown.patch Patch22: php-4.3.11-shutdown.patch
Patch23: php-5.2.2-pdosym.patch
# Functional changes # Functional changes
Patch30: php-5.0.4-dlopen.patch Patch30: php-5.0.4-dlopen.patch
@ -108,7 +109,7 @@ Summary: A module for PHP applications that use IMAP
Group: Development/Languages Group: Development/Languages
Requires: php-common = %{version}-%{release} Requires: php-common = %{version}-%{release}
Obsoletes: mod_php3-imap, stronghold-php-imap Obsoletes: mod_php3-imap, stronghold-php-imap
BuildRequires: krb5-devel, openssl-devel, uw-imap-devel BuildRequires: krb5-devel, openssl-devel, libc-client-devel
%description imap %description imap
The php-imap package contains a dynamic shared object (DSO) for the The php-imap package contains a dynamic shared object (DSO) for the
@ -298,6 +299,7 @@ support for using the DBA database abstraction layer to PHP.
%patch21 -p1 -b .odbc %patch21 -p1 -b .odbc
%patch22 -p1 -b .shutdown %patch22 -p1 -b .shutdown
%patch23 -p1 -b .pdosym
%patch30 -p1 -b .dlopen %patch30 -p1 -b .dlopen
%patch31 -p1 -b .easter %patch31 -p1 -b .easter
@ -631,6 +633,9 @@ rm files.* macros.php
%files pdo -f files.pdo %files pdo -f files.pdo
%changelog %changelog
* Wed May 9 2007 Joe Orton <jorton@redhat.com> 5.2.2-4
- fix php-pdo *_arg_force_ref global symbol abuse (#216125)
* Tue May 8 2007 Joe Orton <jorton@redhat.com> 5.2.2-3 * Tue May 8 2007 Joe Orton <jorton@redhat.com> 5.2.2-3
- rebuild against uw-imap-devel - rebuild against uw-imap-devel