+++ /dev/null
---- php-5.3.3/ext/curl/tests/curl_error_basic.phpt~ 2009-07-03 03:09:08.000000000 +0300
-+++ php-5.3.3/ext/curl/tests/curl_error_basic.phpt 2010-07-26 21:02:34.822382923 +0300
-@@ -30,4 +30,4 @@
- ?>
- --EXPECT--
- == Testing curl_error with a fake URL ==
--Error: Couldn't resolve host 'fakeURL'
-+Error: Could not resolve host: fakeURL (Domain name not found)
+++ /dev/null
---- php-5.3.2/ext/mysqlnd/config9.m4~ 2009-12-22 21:30:09.000000000 +0200
-+++ php-5.3.2/ext/mysqlnd/config9.m4 2010-04-14 01:33:20.435275382 +0300
-@@ -27,7 +27,7 @@
- AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
-
- mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
-- PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
-+ PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, yes)
- PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
- PHP_INSTALL_HEADERS([ext/mysqlnd/])
- fi
---- php-5.3.2/ext/mysqlnd/php_mysqlnd.c~ 2010-01-20 19:09:28.000000000 +0200
-+++ php-5.3.2/ext/mysqlnd/php_mysqlnd.c 2010-04-14 09:18:30.725599897 +0300
-@@ -273,6 +273,9 @@
- };
- /* }}} */
-
-+#ifdef COMPILE_DL_MYSQLND
-+ZEND_GET_MODULE(mysqlnd)
-+#endif
-
- /*
- * Local variables:
---- php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:19:46.991588712 +0300
-+++ php-5.3.8/sapi/fpm/php-fpm.conf.in 2011-12-21 19:07:47.320624976 +0200
+--- php-5.3.9/sapi/fpm/php-fpm.conf.in~ 2012-01-11 21:38:12.000000000 +0200
++++ php-5.3.9/sapi/fpm/php-fpm.conf.in 2012-01-11 21:39:02.535951773 +0200
@@ -22,7 +22,7 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Set permissions for unix socket, if one is used. In Linux, read/write
; permissions must be set in order to allow connections from a web server. Many
-@@ -159,12 +159,12 @@
+@@ -208,12 +208,12 @@
; The desired minimum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
--;pm.min_spare_servers = 5
-+pm.min_spare_servers = 5
+-pm.min_spare_servers = 1
++pm.min_spare_servers = 2
; The desired maximum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
--;pm.max_spare_servers = 35
-+pm.max_spare_servers = 35
-
- ; The number of requests each child process should execute before respawning.
- ; This can be useful to work around memory leaks in 3rd party libraries. For
+-pm.max_spare_servers = 3
++pm.max_spare_servers = 5
+
+ ; The number of seconds after which an idle process will be killed.
+ ; Note: Used only when pm is set to 'ondemand'
@@ -214,7 +214,7 @@
; anything, but it may not be a good idea to use the .php extension or it
; may conflict with a real PHP file.
---- php-5.3.4/php.ini~ 2010-12-12 23:03:42.000000000 +0200
-+++ php-5.3.4/php.ini 2010-12-12 23:05:56.583592856 +0200
+--- php-5.3.9/php.ini~ 2012-01-11 21:35:14.000000000 +0200
++++ php-5.3.9/php.ini 2012-01-11 21:35:49.227068991 +0200
@@ -223,7 +223,7 @@
; Development Value: Off
; Production Value: Off
;
; extension=msql.so
;
-@@ -887,39 +887,8 @@
+@@ -899,53 +899,8 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
-;extension=php_mysql.dll
-;extension=php_mysqli.dll
-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+-;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
-;extension=php_openssl.dll
-;extension=php_pdo_firebird.dll
-;extension=php_pdo_mssql.dll
-;extension=php_pgsql.dll
-;extension=php_pspell.dll
-;extension=php_shmop.dll
+-
+-; The MIBS data available in the PHP distribution must be installed.
+-; See http://www.php.net/manual/en/snmp.installation.php
+-;extension=php_snmp.dll
+-
+-;extension=php_soap.dll
+-;extension=php_sockets.dll
+-;extension=php_sqlite.dll
+-;extension=php_sqlite3.dll
+-;extension=php_sybase_ct.dll
+-;extension=php_tidy.dll
+-;extension=php_xmlrpc.dll
+-;extension=php_xsl.dll
+-;extension=php_zip.dll
+; Ideally in PLD Linux you should install appropriate php-<extension> or
+; php-pecl-<extension> package.
- ; The MIBS data available in the PHP distribution must be installed.
- ; See http://www.php.net/manual/en/snmp.installation.php
+ ;;;;;;;;;;;;;;;;;;;
+ ; Module Settings ;
@@ -1235,6 +1140,9 @@
; http://php.net/mysql.connect-timeout
mysql.connect_timeout = 60
+++ /dev/null
---- php-5.3.3/acinclude.m4.orig 2010-10-19 21:38:42.000000000 +0200
-+++ php-5.3.3/acinclude.m4 2010-10-19 22:53:11.792893220 +0200
-@@ -2252,7 +2252,7 @@
- KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
- KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`
-
-- if test -n "$KERBEROS_LIBS" && test -n "$KERBEROS_CFLAGS"; then
-+ if test -n "$KERBEROS_LIBS" || test -n "$KERBEROS_CFLAGS"; then
- found_kerberos=yes
- PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
- PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
return SUCCESS;
}
-@@ -108,9 +107,7 @@
-
- php_info_print_table_end();
-
--#ifdef PDO_USE_MYSQLND
- DISPLAY_INI_ENTRIES();
--#endif
- }
- /* }}} */
-
@@ -161,6 +161,7 @@
pdo_mysql_globals->debug = NULL; /* The actual string */
pdo_mysql_globals->dbg = NULL; /* The DBG object*/
%undefine with_filter
%endif
-%define rel 13
+%define rel 0.1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: php
-Version: 5.3.8
+Version: 5.3.9
Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 704cd414a0565d905e1074ffdc1fadfb
+# Source0-md5: dd3288ed5c08cd61ac5bf619cb357521
Source2: %{name}-mod_%{name}.conf
Source3: %{name}-cgi-fcgi.ini
Source4: %{name}-apache.ini
Patch51: spl-shared.patch
Patch52: pcre-shared.patch
Patch53: fix-test-run.patch
-Patch54: mysqlnd-shared.patch
Patch55: bug-52078-fileinode.patch
-Patch57: bug-52448.patch
Patch59: %{name}-systzdata.patch
Patch60: %{name}-oracle-instantclient.patch
-Patch61: %{name}-krb5-ac.patch
Patch62: mcrypt-libs.patch
Patch63: %{name}-mysql-nowarning.patch
Patch64: %{name}-m4.patch
%patch51 -p1
%patch52 -p1
%patch53 -p1
-%patch54 -p1
%undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
%patch55 -p1
-%patch57 -p1
%patch59 -p1
%patch60 -p1
-%patch61 -p1
%patch62 -p1
%patch63 -p1
%patch64 -p1
}
}
#endif
-diff -Naurp php-5.3.6RC1/sapi/cgi/cgi_main.c php-5.3.6RC1.oden/sapi/cgi/cgi_main.c
---- php-5.3.6RC1/sapi/cgi/cgi_main.c 2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.6RC1.oden/sapi/cgi/cgi_main.c 2011-02-20 11:57:02.864596378 +0100
-@@ -1929,10 +1929,18 @@ consult the installation file that came
+--- php-5.3.9/sapi/cgi/cgi_main.c~ 2012-01-11 21:40:09.000000000 +0200
++++ php-5.3.9/sapi/cgi/cgi_main.c 2012-01-11 21:43:37.468650443 +0200
+@@ -1948,11 +1948,19 @@
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
}
+#if SUHOSIN_PATCH
- #if ZEND_DEBUG
-- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
- #else
-- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++#if ZEND_DEBUG
++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++#else
++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#endif
+#else
-+ #if ZEND_DEBUG
-+ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ #else
-+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ #endif
+ #if ZEND_DEBUG
+ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ #else
+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#endif
++#endif
php_request_shutdown((void *) 0);
fcgi_shutdown();
-diff -Naurp php-5.3.6RC1/sapi/cli/php_cli.c php-5.3.6RC1.oden/sapi/cli/php_cli.c
---- php-5.3.6RC1/sapi/cli/php_cli.c 2011-01-01 03:19:59.000000000 +0100
-+++ php-5.3.6RC1.oden/sapi/cli/php_cli.c 2011-02-20 11:58:39.473179737 +0100
-@@ -832,7 +832,11 @@ int main(int argc, char *argv[])
+ exit_status = 0;
+--- php-5.3.9/sapi/cli/php_cli.c~ 2012-01-01 15:15:04.000000000 +0200
++++ php-5.3.9/sapi/cli/php_cli.c 2012-01-11 21:44:56.122264808 +0200
+@@ -826,7 +826,11 @@
}
request_started = 1;
-- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s",
+- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s",
+ php_printf("PHP %s "
+#if SUHOSIN_PATCH
-+ "with Suhosin-Patch "
++ "with Suhosin-Patch "
+#endif
-+ "(%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s",
++ "(%s) (built: %s %s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s",
PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
projects / packages / php.git / commitdiff