diff options
| author | ale <ale@FreeBSD.org> | 2007-03-04 19:33:14 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2007-03-04 19:33:14 +0800 |
| commit | 60a0b6f1f4c9929db9c28da88bcdce0f49be6467 (patch) | |
| tree | 5ba2166bebde558b4b5b87cdee878a40af450795 /www/php4-session | |
| parent | 28b6b506ed833c21fd2fde946e76ad1b53e18b7c (diff) | |
| download | freebsd-ports-gnome-60a0b6f1f4c9929db9c28da88bcdce0f49be6467.tar.gz freebsd-ports-gnome-60a0b6f1f4c9929db9c28da88bcdce0f49be6467.tar.zst freebsd-ports-gnome-60a0b6f1f4c9929db9c28da88bcdce0f49be6467.zip | |
Update to 4.4.6 release.
Diffstat (limited to 'www/php4-session')
| -rw-r--r-- | www/php4-session/Makefile | 2 | ||||
| -rw-r--r-- | www/php4-session/files/patch-session.c | 33 |
2 files changed, 0 insertions, 35 deletions
diff --git a/www/php4-session/Makefile b/www/php4-session/Makefile index b138bfec0d78..613a2f07fad7 100644 --- a/www/php4-session/Makefile +++ b/www/php4-session/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 1 - CATEGORIES= www MASTERDIR= ${.CURDIR}/../../lang/php4 diff --git a/www/php4-session/files/patch-session.c b/www/php4-session/files/patch-session.c deleted file mode 100644 index fc6bd3c092f2..000000000000 --- a/www/php4-session/files/patch-session.c +++ /dev/null @@ -1,33 +0,0 @@ ---- session.c 2007/01/09 15:31:36 1.336.2.53.2.13 -+++ session.c 2007/02/15 09:41:30 1.336.2.53.2.14 -@@ -271,8 +271,12 @@ - { - zval **sym_track = NULL; - -- zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1, -- (void *) &sym_track); -+ IF_SESSION_VARS() { -+ zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen + 1, -+ (void *) &sym_track); -+ } else { -+ return; -+ } - - /* - * Set up a proper reference between $_SESSION["x"] and $x. -@@ -281,11 +285,10 @@ - if (PG(register_globals)) { - zval **sym_global = NULL; - -- zend_hash_find(&EG(symbol_table), name, namelen + 1, -- (void *) &sym_global); -- -- if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) { -- return; -+ if (zend_hash_find(&EG(symbol_table), name, namelen + 1, (void *) &sym_global) == SUCCESS) { -+ if ((Z_TYPE_PP(sym_global) == IS_ARRAY && Z_ARRVAL_PP(sym_global) == &EG(symbol_table)) || *sym_global == PS(http_session_vars)) { -+ return; -+ } - } - - if (sym_global == NULL && sym_track == NULL) { |