diff options
| author | Greg Larkin <glarkin@FreeBSD.org> | 2010-04-13 13:08:55 +0000 |
|---|---|---|
| committer | Greg Larkin <glarkin@FreeBSD.org> | 2010-04-13 13:08:55 +0000 |
| commit | b072e3f75c5a42697e8922715eeb1baecd9f9a1f (patch) | |
| tree | 96b7ca9209977bcf3c645a7ccfea2c0afa0b2e5a /security/pecl-ssh2 | |
| parent | 4380ec1531dee9be6dd87ad923c10d07c6c4a2f1 (diff) | |
| download | ports-b072e3f75c5a42697e8922715eeb1baecd9f9a1f.tar.gz ports-b072e3f75c5a42697e8922715eeb1baecd9f9a1f.zip | |
- Unbreak after recent PHP 5.3.2 update
Reported by: pointyhat
Approved by: portmgr (itetcu, erwin - blanket)
Notes
Notes:
svn path=/head/; revision=252635
Diffstat (limited to 'security/pecl-ssh2')
| -rw-r--r-- | security/pecl-ssh2/files/patch-ssh2.c | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/security/pecl-ssh2/files/patch-ssh2.c b/security/pecl-ssh2/files/patch-ssh2.c index 9a59644d2d5a..23a9b468e0ca 100644 --- a/security/pecl-ssh2/files/patch-ssh2.c +++ b/security/pecl-ssh2/files/patch-ssh2.c @@ -1,6 +1,14 @@ ---- ssh2.c 2006-06-07 19:35:34.000000000 +0200 -+++ ssh2.c.oden 2007-08-07 17:32:29.000000000 +0200 -@@ -484,7 +484,7 @@ +--- ./ssh2.c.orig 2007-08-11 23:25:25.000000000 -0400 ++++ ./ssh2.c 2010-04-13 09:05:17.000000000 -0400 +@@ -48,7 +48,6 @@ + #endif + + #ifdef ZEND_ENGINE_2 +-static + ZEND_BEGIN_ARG_INFO(php_ssh2_first_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO() +@@ -484,7 +483,7 @@ ZEND_FETCH_RESOURCE(session, LIBSSH2_SESSION*, &zsession, -1, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); @@ -9,3 +17,34 @@ libssh2_session_methods(session, &kex, &hostkey, &crypt_cs, &crypt_sc, &mac_cs, &mac_sc, &comp_cs, &comp_sc, &lang_cs, &lang_sc); #else kex = libssh2_session_methods(session, LIBSSH2_METHOD_KEX); +@@ -889,7 +888,7 @@ + for(i = 0; i < numfds; i++) { + zval *subarray = *pollmap[i]; + +- if (!subarray->is_ref && subarray->refcount > 1) { ++ if (!Z_ISREF_P(subarray) && Z_REFCOUNT_P(subarray) > 1) { + /* Make a new copy of the subarray zval* */ + MAKE_STD_ZVAL(subarray); + *subarray = **pollmap[i]; +@@ -899,8 +898,8 @@ + zval_copy_ctor(subarray); + + /* Fixup its refcount */ +- subarray->is_ref = 0; +- subarray->refcount = 1; ++ Z_UNSET_ISREF_P(subarray); ++ Z_SET_REFCOUNT_P(subarray, 1); + } + zend_hash_del(Z_ARRVAL_P(subarray), "revents", sizeof("revents")); + add_assoc_long(subarray, "revents", pollfds[i].revents); +@@ -1009,8 +1008,8 @@ + } + + zval_copy_ctor(©val); +- copyval.is_ref = 0; +- copyval.refcount = 1; ++ Z_UNSET_ISREF(copyval); ++ Z_SET_REFCOUNT(copyval, 1); + convert_to_string(©val); + + if (*key == '*') { |