echo "end!<br>\n";
?>
---- php-7.0.0beta1/sapi/cgi/cgi_main.c~ 2015-07-13 16:14:53.000000000 +0300
-+++ php-7.0.0beta1/sapi/cgi/cgi_main.c 2015-07-15 13:51:32.072326529 +0300
+--- php-7.1.0alpha2/sapi/cgi/cgi_main.c~ 2016-07-04 14:56:49.000000000 +0300
++++ php-7.1.0alpha2/sapi/cgi/cgi_main.c 2016-07-04 14:58:17.522958766 +0300
@@ -101,6 +101,9 @@
*/
static int parent = 1;
fcgi_request *request = NULL;
int repeats = 1;
int benchmark = 0;
-@@ -2050,10 +2050,13 @@
- */
+@@ -2080,9 +2080,14 @@
parent = 0;
-- /* don't catch our signals */
+ /* don't catch our signals */
- sigaction(SIGTERM, &old_term, 0);
sigaction(SIGQUIT, &old_quit, 0);
sigaction(SIGINT, &old_int, 0);
+ act.sa_flags = 0;
+ act.sa_handler = fastcgi_graceful_shutdown;
+ sigaction(SIGTERM, &act, &old_term);
++
+ zend_signal_init();
break;
case -1:
- perror("php (pre-forking)");
---- php-5.6.2/sapi/fpm/php-fpm.conf.in 2014-10-27 08:20:34.963718145 +0200
-+++ php-5.6.2.old/sapi/fpm/php-fpm.conf.in 2014-10-27 08:07:47.762117299 +0200
+--- php-7.1.0beta3/sapi/fpm/php-fpm.conf.in~ 2016-08-19 09:48:00.000000000 +0300
++++ php-7.1.0beta3/sapi/fpm/php-fpm.conf.in 2016-08-31 13:59:19.139523160 +0300
@@ -14,14 +14,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
- ; in a local file.
+ ; into a local file.
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: log/php-fpm.log
-;error_log = log/php-fpm.log
---- php-7.0.12/php.ini~ 2016-10-14 17:03:05.000000000 +0300
-+++ php-7.0.12/php.ini 2016-10-14 17:04:24.894309139 +0300
+--- php-7.1.0RC3/php.ini~ 2016-10-04 18:47:57.000000000 +0300
++++ php-7.1.0RC3/php.ini 2016-10-04 18:50:05.861335161 +0300
@@ -82,6 +82,20 @@
; much more verbose when it comes to errors. We recommending using the
; development version only in development environments as errors shown to
; On windows:
; extension_dir = "ext"
-@@ -746,65 +746,6 @@
+@@ -761,65 +761,6 @@
; http://php.net/enable-dl
enable_dl = Off
;;;;;;;;;;;;;;;;
; File Uploads ;
;;;;;;;;;;;;;;;;
-@@ -823,47 +823,8 @@
+@@ -824,47 +824,8 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
-+; Ideally in PLD Linux you should install appropriate php70-<extension> or
-+; php70-pecl-<extension> package.
++; Ideally in PLD Linux you should install appropriate php71-<extension> or
++; php71-pecl-<extension> package.
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
} else {
tmp = NULL;
}
-diff -up php-7.0.0RC1/ext/date/lib/timelib.m4.systzdata php-7.0.0RC1/ext/date/lib/timelib.m4
---- php-7.0.0RC1/ext/date/lib/timelib.m4.systzdata 2015-08-18 23:39:24.000000000 +0200
-+++ php-7.0.0RC1/ext/date/lib/timelib.m4 2015-08-22 07:47:34.854055364 +0200
-@@ -78,3 +78,17 @@ stdlib.h
+--- php-7.1.0RC4/ext/date/lib/timelib.m4~ 2016-10-17 14:35:11.000000000 +0300
++++ php-7.1.0RC4/ext/date/lib/timelib.m4 2016-10-25 14:11:32.224877793 +0300
+@@ -78,3 +78,16 @@
dnl Check for strtoll, atoll
- AC_CHECK_FUNCS(strtoll atoll strftime)
+ AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday)
+
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
+ [Define for location of system timezone data])
+ fi
+fi
-+
%endif
%define orgname php
-%define ver_suffix 70
+%define ver_suffix 71
%define php_suffix %{!?with_default_php:%{ver_suffix}}
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 7.0.13
-Release: 1
+Version: 7.1.0
+Release: 2
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
License: PHP 3.01 and Zend and BSD
Group: Libraries
Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: eb117bf1d1efc99c522f132b265a3402
+# Source0-md5: cf36039303c47f493100afea522a8f53
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
%{?with_mm:BuildRequires: mm-devel >= 1.3.0}
%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
%if %{with openssl} || %{with ldap}
-BuildRequires: openssl-devel >= 0.9.8
+BuildRequires: openssl-devel >= 1.0.1
%endif
%{?with_gcov:BuildRequires: lcov}
%{?with_snmp:%{?with_tests:BuildRequires: mibs-net-snmp}}
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in %%build
-%define php_api_version 20151012
-%define zend_module_api 20151012
-%define zend_extension_api 320151012
+%define php_api_version 20160303
+%define zend_module_api 20160303
+%define zend_extension_api 320160303
%define php_pdo_api_version 20150127
# Extension versions
%define fileinfover 1.0.5
%define hashver 1.0
%define intlver 1.1.0
-%define jsonver 1.4.0
+%define jsonver 1.5.0
%define pharver 2.0.2
%define sqlite3ver 0.7-dev
%define zipver 1.13.5
Group: Libraries
URL: http://qa.php.net/
Requires: %{name}-cli
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
%description tests
This package contains unit tests for PHP and its extensions.
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q -n %{orgname}-%{version}
+%setup -q -n %{orgname}-%{version}%{?subver}
cp -p php.ini-production php.ini
%patch0 -p1
%patch1 -p1
sapi_args=''
case $sapi in
cgi-fcgi)
- sapi_args='--disable-cli'
+ sapi_args='--enable-cgi'
;;
cli)
- sapi_args='--disable-cgi %{?with_gcov:--enable-gcov}'
+ sapi_args='--enable-cli %{?with_gcov:--enable-gcov}'
;;
fpm)
- sapi_args='--disable-cli --disable-cgi --enable-fpm'
+ sapi_args='--enable-fpm'
;;
embed)
- sapi_args='--disable-cli --disable-cgi --enable-embed'
+ sapi_args='--enable-embed'
;;
apxs2)
ver=$(rpm -q --qf '%{V}' apache-devel)
- sapi_args="--disable-cli --disable-cgi --with-apxs2=%{apxs2} --with-apache-version=$ver"
+ sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
;;
litespeed)
- sapi_args='--disable-cli --disable-cgi --with-litespeed'
+ sapi_args='--with-litespeed'
;;
phpdbg)
- sapi_args='--disable-cli --disable-cgi --enable-phpdbg %{?debug:--enable-phpdbg-debug}'
+ sapi_args='--enable-phpdbg %{?debug:--enable-phpdbg-debug}'
;;
milter)
- sapi_args='--disable-cli --disable-cgi --with-milter'
+ sapi_args='--with-milter'
;;
esac
%configure \
EXTRA_LDFLAGS="%{rpmldflags}" \
+ --disable-cgi \
+ --disable-cli \
+ --disable-phpdbg \
$sapi_args \
%if "%{!?configure_cache:0}%{?configure_cache}" == "0"
--cache-file=config.cache \
extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
---- php-5.3.1/ext/standard/array.c~ 2009-08-14 06:20:21.000000000 +0000
-+++ php-5.3.1/ext/standard/array.c 2009-11-27 16:37:15.029078323 +0000
-@@ -49,6 +49,9 @@
- #ifdef HAVE_SPL
+--- php-7.1.0alpha2/ext/standard/array.c~ 2016-07-04 17:52:16.000000000 +0300
++++ php-7.1.0alpha2/ext/standard/array.c 2016-07-04 18:54:43.937173429 +0300
+@@ -48,6 +48,10 @@
+ #include "zend_smart_str.h"
#include "ext/spl/spl_array.h"
- #endif
+
+#if COMPILE_DL_SPL
+PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
+#endif
-
++
/* {{{ defines */
#define EXTR_OVERWRITE 0
---- php-5.3.1/ext/pdo/pdo.c~ 2009-07-19 22:46:03.000000000 +0000
-+++ php-5.3.1/ext/pdo/pdo.c 2009-11-27 16:37:51.332409104 +0000
-@@ -132,7 +132,7 @@
+ #define EXTR_SKIP 1
+--- php-7.1.0alpha1/ext/pdo/pdo.c~ 2016-06-07 23:56:47.000000000 +0300
++++ php-7.1.0alpha1/ext/pdo/pdo.c 2016-06-13 23:24:51.238259131 +0300
+@@ -117,7 +117,9 @@
+
/* {{{ pdo_functions[] */
- #if ZEND_MODULE_API_NO >= 20050922
static const zend_module_dep pdo_deps[] = {
--#ifdef HAVE_SPL
+#ifdef HAVE_SPL && !COMPILE_DL_SPL
ZEND_MOD_REQUIRED("spl")
- #endif
- {NULL, NULL, NULL}
++#endif
+ ZEND_MOD_END
+ };
+ /* }}} */
--- php-5.3.1/ext/phar/Makefile.frag~ 2009-07-23 15:48:04.000000000 +0000
+++ php-5.3.1/ext/phar/Makefile.frag 2009-11-30 16:10:29.687175948 +0000
@@ -10,7 +10,7 @@
projects / packages / php.git / commitdiff