Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2015-02-20 13:50:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2015-01-27 09:09:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2015-02-20 13:50:39.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 9 08:19:06 UTC 2015 - [email protected] + +- added README.default_socket_timeout [bnc#907519] + +------------------------------------------------------------------- +Tue Feb 3 08:30:28 UTC 2015 - [email protected] + +- fix sle_11_sp3 build + +------------------------------------------------------------------- New: ---- README.default_socket_timeout ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.j7AW8R/_old 2015-02-20 13:50:40.000000000 +0100 +++ /var/tmp/diff_new_pack.j7AW8R/_new 2015-02-20 13:50:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -71,9 +71,13 @@ BuildRequires: unixODBC-devel BuildRequires: update-alternatives BuildRequires: xz +%if 0%{suse_version} > 1110 BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xpm) +%else +BuildRequires: xorg-x11-devel +%endif %if 0%{suse_version} > 1110 BuildRequires: freetds-devel %endif @@ -148,6 +152,7 @@ Source7: php-fpm.init Source8: http://us3.php.net/distributions/php-%{version}.tar.xz.asc Source9: php5.keyring +Source10: README.default_socket_timeout Source100: build-test.sh #SUSE specific stuff Patch0: php5-phpize.patch @@ -1302,6 +1307,7 @@ %{__mv} ext/suhosin-%{suhosin_version} ext/suhosin %{__cp} %{S:4} pear/README.SUSE %{__cp} %{S:5} . +%{__cp} %{S:10} . %patch0 %patch1 %patch2 @@ -1498,7 +1504,9 @@ --with-png-dir=%{_usr} \ --with-jpeg-dir=%{_usr} \ --with-zlib-dir=%{_usr} \ +%if 0%{suse_version} > 1110 --with-vpx-dir=%{_usr} \ +%endif --with-gettext=shared \ --with-gmp=shared \ --with-iconv=shared \ ++++++ README.default_socket_timeout ++++++ Scope of default_socket_timeout Directive ========================================= default_socket_timeout do not work for SSL connections. This is long standing feature request in PHP upstream bugzilla, see PHP bug #41631. To sum up, ini_set("default_socket_timeout", $time); fopen($https_url, "r"); do not work as intended in the contrast to ini_set("default_socket_timeout", $time); fopen($http_url, "r"); Socket timeout for SSL connections can be set successfully when libcurl trough curl PHP extension is used: $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $https_url); curl_setopt($ch, CURLOPT_TIMEOUT, $time); curl_exec($ch); curl_close($ch); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
