Permalink
Browse files

Update from el7 php package.

  • Loading branch information...
andytson committed Feb 3, 2014
1 parent 01674ad commit f60046d902865aecbaad79b846437b1bdd8c5356
Showing with 934 additions and 531 deletions.
  1. +4 −3 macros.php
  2. +1 −1 php-5.2.4-embed.patch
  3. +0 −24 php-5.4.7-libdb.patch
  4. +58 −0 php-5.4.7-odbctimer.patch
  5. +60 −216 php-fpm-www.conf
  6. +3 −48 php-fpm.conf
  7. +3 −0 php-fpm.init
  8. +1 −1 php-fpm.logrotate
  9. +15 −0 php-fpm.service
  10. +2 −0 php-fpm.sysconfig
  11. +17 −13 php.conf
  12. +145 −44 php.ini
  13. +8 −0 php.modconf
  14. +4 −0 php.ztsmodconf
  15. +613 −181 php55.spec
View
@@ -3,9 +3,10 @@
#
%php_core_api @PHP_APIVER@
%php_zend_api @PHP_ZENDVER@
%php_pdo_api @PHP_PDOVER@
%php_pdo_api @PHP_PDOVER@
%php_version @PHP_VERSION@
%php_extdir %{_libdir}/php/modules
%php_extdir %{_libdir}/php/modules
%php_ztsextdir %{_libdir}/php-zts/modules
%php_inidir %{_sysconfdir}/php.d
@@ -15,4 +16,4 @@
%php_ztsincldir %{_includedir}/php-zts/php
%__php %{_bindir}/php
%__ztsphp %{_bindir}/zts-php
%__ztsphp %{_bindir}/zts-php
View
@@ -5,7 +5,7 @@
yes|shared)
PHP_EMBED_TYPE=shared
- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_VERSION)"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)"
+ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
;;
static)
View
@@ -60,27 +60,3 @@
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
--- php-5.4.7/ext/dba/dba.c.old 2012-09-19 14:55:23.868456900 +0200
+++ php-5.4.7/ext/dba/dba.c 2012-09-19 15:02:42.796009320 +0200
@@ -52,6 +52,10 @@
#include "php_qdbm.h"
#include "php_tcadb.h"
+#ifdef DB4_INCLUDE_FILE
+#include DB4_INCLUDE_FILE
+#endif
+
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
ZEND_ARG_INFO(0, path)
@@ -522,6 +526,10 @@
php_info_print_table_start();
php_info_print_table_row(2, "DBA support", "enabled");
+#ifdef DB_VERSION_STRING
+ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING);
+ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL));
+#endif
if (handlers.c) {
smart_str_0(&handlers);
php_info_print_table_row(2, "Supported handlers", handlers.c);
View
@@ -0,0 +1,58 @@
From 657494235eafe048e9fa6a19dcdb3c73a0cbe6ec Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 27 Sep 2012 13:45:32 +0200
Subject: [PATCH] Fixed bug #63171, script hangs if odbc call during timeout
---
ext/odbc/php_odbc.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 52d46b2..2169e65 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -431,7 +431,8 @@ static void _free_odbc_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
efree(res->values);
res->values = NULL;
}
- if (res->stmt) {
+ /* If aborted via timer expiration, don't try to call any unixODBC function */
+ if (res->stmt && !(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) {
#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35)
SQLTransact(res->conn_ptr->henv, res->conn_ptr->hdbc,
(SQLUSMALLINT) SQL_COMMIT);
@@ -484,9 +485,12 @@ static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
}
}
- safe_odbc_disconnect(conn->hdbc);
- SQLFreeConnect(conn->hdbc);
- SQLFreeEnv(conn->henv);
+ /* If aborted via timer expiration, don't try to call any unixODBC function */
+ if (!(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) {
+ safe_odbc_disconnect(conn->hdbc);
+ SQLFreeConnect(conn->hdbc);
+ SQLFreeEnv(conn->henv);
+ }
efree(conn);
ODBCG(num_links)--;
}
@@ -512,9 +516,12 @@ static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
}
}
- safe_odbc_disconnect(conn->hdbc);
- SQLFreeConnect(conn->hdbc);
- SQLFreeEnv(conn->henv);
+ /* If aborted via timer expiration, don't try to call any unixODBC function */
+ if (!(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) {
+ safe_odbc_disconnect(conn->hdbc);
+ SQLFreeConnect(conn->hdbc);
+ SQLFreeEnv(conn->henv);
+ }
free(conn);
ODBCG(num_links)--;
--
1.7.10
Oops, something went wrong.

0 comments on commit f60046d

Please sign in to comment.