Djam/php7
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/php7.git synced 2025-02-22 22:32:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adopt patches for 7.3

Browse source
This commit is contained in:
Denis Silakov 2018-09-29 16:26:27 +03:00
parent 0708035f91
commit b8d208ae8f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
php.spec
View file

@ -22,7 +22,7 @@ Summary: The PHP7 scripting language
Name: php
Version: 7.3.0
%if "%{beta}" != ""
Release: 0.%{beta}.1
Release: 0.%{beta}.2
Source0: https://downloads.php.net/~cmb/php-%{version}%{beta}.tar.xz
%else
Release: 1
@ -63,9 +63,9 @@ Patch22: php-dba-link.patch
Patch23: php-zlib-for-getimagesize.patch
# for kolab2
# P50 was rediffed from PLD (php-5.3.3-8.src.rpm) which merges the annotation and status-current patches
Patch27: php-imap-annotation+status-current.diff
#Patch27: php-imap-annotation+status-current.diff
# P51 was taken from http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/php/patches/php-5.3.2/
Patch28: php-imap-myrights.diff
#Patch28: php-imap-myrights.diff
Patch29: php-5.3.x-fpm-0.6.5-shared.diff
Patch30: php-5.3.x-fpm-0.6.5-mdv_conf.diff
#####################################################################

4
php5-apache2-filters.diff
View file

@ -41,8 +41,8 @@
+ zval **filter_name;
+ ap_filter_rec_t* ap_filter;
+
+ if (arg_count != 1 ||
+ zend_get_parameters_ex(arg_count, &filter_name) == FAILURE) {
+ if (arg_count != 1 /*||
+ zend_get_parameters_ex(arg_count, &filter_name) == FAILURE*/) {
+ WRONG_PARAM_COUNT;
+ }
+