/[smeserver]/rpms/php/sme8/php-5.3.3-r305043.patch
ViewVC logotype

Annotation of /rpms/php/sme8/php-5.3.3-r305043.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Mon Jun 20 19:27:01 2011 UTC (13 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: php-5_3_3-15_el5_sme, php-5_3_3-1_el5_7_3, php-5_3_3-13_el5_9_1, php-5_3_3-16_el5_sme, php-5_3_3-14_el5_sme, php-5_3_3-1_el5_sme_6, php-5_3_3-13_el5_sme_1, php-5_3_3-1_el5_sme_3, php-5_3_3-1_el5_sme_1_0, php-5_3_3-13_el5_sme_2, php-5_3_3-1_el5_sme_1_1, php-5_3_3-17_el5_sme, php-5_3_3-1_el5_7_6, php-5_3_3-13_el5_sme, php-5_3_3-13_el6, php-5_3_3-1_el5_sme_1, HEAD
Branch point for: redhat-upstream
Import upstream sources

1 slords 1.1
2     http://svn.php.net/viewvc?view=revision&revision=305043
3    
4     --- php-5.3.3/Zend/tests/bug45180.phpt.r305043
5     +++ php-5.3.3/Zend/tests/bug45180.phpt
6     @@ -43,11 +43,11 @@ __call:
7     string(3) "ABC"
8     __call:
9     string(3) "ABC"
10     -__callstatic:
11     +__call:
12     string(3) "XYZ"
13     -__callstatic:
14     +__call:
15     string(3) "WWW"
16     -__callstatic:
17     +__call:
18     string(3) "ABC"
19     __callstatic:
20     string(1) "A"
21     @@ -58,4 +58,4 @@ string(1) "C"
22     __callstatic:
23     string(3) "FOO"
24     __callstatic:
25     -string(3) "FOO"
26     +string(3) "FOO"
27     \ No newline at end of file
28     --- php-5.3.3/Zend/tests/bug45186.phpt.r305043
29     +++ php-5.3.3/Zend/tests/bug45186.phpt
30     @@ -35,17 +35,17 @@ call_user_func('self::y');
31    
32     ?>
33     --EXPECTF--
34     -__callstatic:
35     +__call:
36     string(3) "ABC"
37     -__callstatic:
38     +__call:
39     string(3) "ABC"
40     __call:
41     string(3) "xyz"
42     -__callstatic:
43     +__call:
44     string(3) "www"
45     __call:
46     string(1) "y"
47     -__callstatic:
48     +__call:
49     string(1) "y"
50     ok
51     __callstatic:
52     --- php-5.3.3/Zend/tests/bug51176.phpt.r305043
53     +++ php-5.3.3/Zend/tests/bug51176.phpt
54     @@ -27,6 +27,6 @@ $foo->start();
55    
56     ?>
57     --EXPECT--
58     -static
59     -static
60     -static
61     +instance
62     +instance
63     +instance
64     \ No newline at end of file
65     --- php-5.3.3/Zend/tests/call_static_003.phpt.r305043
66     +++ php-5.3.3/Zend/tests/call_static_003.phpt
67     @@ -28,9 +28,9 @@ foo::BAZ();
68     --EXPECT--
69     nonstatic
70     string(6) "fOoBaR"
71     -static
72     +nonstatic
73     string(6) "foOBAr"
74     -static
75     +nonstatic
76     string(6) "fOOBAr"
77     static
78     string(3) "bAr"
79     --- php-5.3.3/Zend/tests/call_static_007.phpt.r305043
80     +++ php-5.3.3/Zend/tests/call_static_007.phpt
81     @@ -30,5 +30,5 @@ a::Foo();
82     --EXPECT--
83     __callstatic: Test
84     __call: Test
85     -__callstatic: Bar
86     +__call: Bar
87     __callstatic: Foo
88     --- php-5.3.3/Zend/zend_object_handlers.c.r305043
89     +++ php-5.3.3/Zend/zend_object_handlers.c
90     @@ -953,13 +953,13 @@ ZEND_API zend_function *zend_std_get_sta
91     if (!fbc && zend_hash_find(&ce->function_table, lc_function_name, function_name_strlen+1, (void **) &fbc)==FAILURE) {
92     efree(lc_function_name);
93    
94     - if (ce->__callstatic) {
95     - return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
96     - } else if (ce->__call &&
97     + if (ce->__call &&
98     EG(This) &&
99     Z_OBJ_HT_P(EG(This))->get_class_entry &&
100     instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) {
101     return zend_get_user_call_function(ce, function_name_strval, function_name_strlen);
102     + } else if (ce->__callstatic) {
103     + return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
104     } else {
105     return NULL;
106     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed