cvs: ZendEngine2(PHP_5_2) / zend_API.c /tests access_modifiers_012.phpt

andrei		Thu Jan  8 21:39:06 2009 UTC

  Added files:                 (Branch: PHP_5_2)
    /ZendEngine2/tests	access_modifiers_012.phpt 

  Modified files:              
    /ZendEngine2	zend_API.c 
  Log:
  Handle __call() on protected/private method access for callbacks too.
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.40&r2=1.296.2.27.2.41&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.40 ZendEngine2/zend_API.c:1.296.2.27.2.41
--- ZendEngine2/zend_API.c:1.296.2.27.2.40	Wed Dec 31 11:17:32 2008
+++ ZendEngine2/zend_API.c	Thu Jan  8 21:39:06 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.c,v 1.296.2.27.2.40 2008/12/31 11:17:32 sebastian Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.41 2009/01/08 21:39:06 andrei Exp $ */
 
 #include "zend.h"
 #include "zend_execute.h"
@@ -2216,6 +2216,10 @@
 						retval = 0;
 					}
 				}
+				if (!retval && *zobj_ptr_ptr && *ce_ptr && (*ce_ptr)->__call != 0) {
+					retval = (*ce_ptr)->__call != NULL;
+					*fptr_ptr = (*ce_ptr)->__call;
+				}
 			}
 		}
 	}

http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/access_modifiers_012.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/access_modifiers_012.phpt
+++ ZendEngine2/tests/access_modifiers_012.phpt