diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-03-17 10:06:46 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-03-17 10:10:12 +0000 |
commit | 6852c0bac0b2a159b3c4a4e480e8f1970d7b5ba6 (patch) | |
tree | e5bde5620bbbf29d456adb5b9284ce27c0acc680 | |
parent | 3548d000c89a0b85bf4afd8d845a895821a8f43a (diff) | |
download | alpine_aports-6852c0bac0b2a159b3c4a4e480e8f1970d7b5ba6.tar.bz2 alpine_aports-6852c0bac0b2a159b3c4a4e480e8f1970d7b5ba6.tar.xz alpine_aports-6852c0bac0b2a159b3c4a4e480e8f1970d7b5ba6.zip |
main/php: apply upstream patch to fix issue that affects mediawiki
Mediawiki page has it on download page
http://www.mediawiki.org/w/index.php?title=Download&oldid=308208
References:
http://www.mwusers.com/forums/showthread.php?14371-ConfirmEdit-and-reCaptcha-extensions-cause-Internal-Errors
http://bugs.php.net/bug.php?id=50394
(cherry picked from commit 86f5dd8f22d0f1d0285888865861703ea51725e3)
-rw-r--r-- | main/php/APKBUILD | 6 | ||||
-rw-r--r-- | main/php/zend_execute_API.c.patch | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 34a5c77971..1b72cc3098 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD | |||
@@ -3,7 +3,7 @@ | |||
3 | pkgname=php | 3 | pkgname=php |
4 | pkgver=5.3.2 | 4 | pkgver=5.3.2 |
5 | _suhosinver=${pkgver}-0.9.9.1 | 5 | _suhosinver=${pkgver}-0.9.9.1 |
6 | pkgrel=0 | 6 | pkgrel=1 |
7 | pkgdesc="The PHP language runtime engine" | 7 | pkgdesc="The PHP language runtime engine" |
8 | url="http://www.php.net/" | 8 | url="http://www.php.net/" |
9 | license="PHP-3" | 9 | license="PHP-3" |
@@ -63,6 +63,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli | |||
63 | 63 | ||
64 | source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 | 64 | source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 |
65 | http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz | 65 | http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz |
66 | zend_execute_API.c.patch | ||
66 | " | 67 | " |
67 | 68 | ||
68 | _extdir="/usr/lib/php/20090626" | 69 | _extdir="/usr/lib/php/20090626" |
@@ -241,4 +242,5 @@ dev() { | |||
241 | } | 242 | } |
242 | 243 | ||
243 | md5sums="46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2 | 244 | md5sums="46f500816125202c48a458d0133254a4 php-5.3.2.tar.bz2 |
244 | 4647b05330862d6a1fc4469245cc6ade suhosin-patch-5.3.2-0.9.9.1.patch.gz" | 245 | 4647b05330862d6a1fc4469245cc6ade suhosin-patch-5.3.2-0.9.9.1.patch.gz |
246 | 55f9d24316a57e0c0f6b4b84791a1a17 zend_execute_API.c.patch" | ||
diff --git a/main/php/zend_execute_API.c.patch b/main/php/zend_execute_API.c.patch new file mode 100644 index 0000000000..0976a7b391 --- /dev/null +++ b/main/php/zend_execute_API.c.patch | |||
@@ -0,0 +1,10 @@ | |||
1 | --- PHP_5_3/Zend/zend_execute_API.c 2009/12/18 18:41:53 292294 | ||
2 | +++ PHP_5_3/Zend/zend_execute_API.c 2009/12/18 19:12:11 292295 | ||
3 | @@ -838,6 +838,7 @@ | ||
4 | zval *param; | ||
5 | |||
6 | if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION | ||
7 | + && (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0 | ||
8 | && !ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1) | ||
9 | && PZVAL_IS_REF(*fci->params[i])) { | ||
10 | SEPARATE_ZVAL(fci->params[i]); | ||