date:20111108

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/package.xml branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt branches/PHP_5_3/ext/o

2011-11-08 Thread Christopher Jones

sixd Wed, 09 Nov 2011 06:19:07 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318939

Log:
Add tests for unsupported types

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/oci8/package.xml
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_uin.phpt
U   php/php-src/branches/PHP_5_4/ext/oci8/package.xml
A   php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt
A   php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bfloat.phpt
A   php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_uin.phpt
U   php/php-src/trunk/ext/oci8/package.xml
A   php/php-src/trunk/ext/oci8/tests/array_bind_bdouble.phpt
A   php/php-src/trunk/ext/oci8/tests/array_bind_bfloat.phpt
A   php/php-src/trunk/ext/oci8/tests/array_bind_uin.phpt

Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml
===
--- php/php-src/branches/PHP_5_3/ext/oci8/package.xml	2011-11-09 05:27:45 UTC (rev 318938)
+++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml	2011-11-09 06:19:07 UTC (rev 318939)
@@ -33,7 +33,7 @@
   no
  

- 2011-11-03
+ 2011-11-08
  12:00:00

  
@@ -66,6 +66,8 @@
 
 
 
+
+
 
 
 
@@ -74,6 +76,7 @@
 
 
 
+
 
 
 

Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt	2011-11-09 06:19:07 UTC (rev 318939)
@@ -0,0 +1,21 @@
+--TEST--
+Unsupported type: oci_bind_array_by_name() and SQLT_BDOUBLE
+--SKIPIF--
+ true, 'timesten' => false);  // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+
+--EXPECTF--
+Warning: oci_bind_array_by_name(): Unknown or unsupported datatype given: 22 in %sarray_bind_bdouble.php on line %d
+Done


Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt	2011-11-09 06:19:07 UTC (rev 318939)
@@ -0,0 +1,21 @@
+--TEST--
+Unsupported type: oci_bind_array_by_name() and SQLT_BFLOAT
+--SKIPIF--
+ true, 'timesten' => false);  // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+
+--EXPECTF--
+Warning: oci_bind_array_by_name(): Unknown or unsupported datatype given: 21 in %sarray_bind_bfloat.php on line %d
+Done


Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_uin.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_uin.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_uin.phpt	2011-11-09 06:19:07 UTC (rev 318939)
@@ -0,0 +1,21 @@
+--TEST--
+Unsupported type: oci_bind_array_by_name() and SQLT_UIN
+--SKIPIF--
+ true, 'timesten' => false);  // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+
+--EXPECTF--
+Warning: oci_bind_array_by_name(): Unknown or unsupported datatype given: 68 in %sarray_bind_uin.php on line %d
+Done


Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_uin.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_4/ext/oci8/package.xml
===
--- php/php-src/branches/PHP_5_4/ext/oci8/package.xml	2011-11-09 05:27:45 UTC (rev 318938)
+++ php/php-src/branches/PHP_5_4/ext/oci8/package.xml	2011-11-09 06:19:07 UTC (rev 318939)
@@ -33,7 +33,7 @@
   no
  

- 2011-11-03
+ 2011-11-08
  12:00:00

  
@@ -66,6 +66,8 @@
 
 
 
+
+
 
 
 
@@ -74,6 +76,7 @@
 
 
 
+
 
 
 

Added: php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt
===
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/array_

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_signal.c

2011-11-08 Thread Rasmus Lerdorf

rasmus   Tue, 08 Nov 2011 20:37:09 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318922

Log:
Here too

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/zend_signal.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_signal.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_signal.c 2011-11-08 20:32:29 UTC 
(rev 318921)
+++ php/php-src/branches/PHP_5_4/Zend/zend_signal.c 2011-11-08 20:37:09 UTC 
(rev 318922)
@@ -267,7 +267,7 @@
sa.sa_mask  = global_sigmask;

if (sigaction(signo, &sa, NULL) < 0) {
-   zend_error(E_ERROR, "Error installing signal handler 
for %d", signo);
+   zend_error(E_WARNING, "Error installing signal handler 
for %d", signo);
}

return SUCCESS;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_signal.c

2011-11-08 Thread Stas Malyshev


Hi!


rasmus   Tue, 08 Nov 2011 20:32:29 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318921

Log:
This really shouldn't fail, but if it does, like on OSX under Valgrind,
let's just issue a warning.

Changed paths:
 U   php/php-src/branches/PHP_5_4/Zend/zend_signal.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_signal.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_signal.c 2011-11-08 19:07:23 UTC 
(rev 318920)
+++ php/php-src/branches/PHP_5_4/Zend/zend_signal.c 2011-11-08 20:32:29 UTC 
(rev 318921)
@@ -215,7 +215,7 @@
sa.sa_mask  = global_sigmask;

if (sigaction(signo,&sa, NULL)<  0) {
-   zend_error(E_ERROR, "Error installing signal handler for 
%d", signo);
+   zend_error(E_WARNING, "Error installing signal handler for 
%d", signo);
}


IIRC there's one more place where we do sigaction and E_ERROR in the 
same file.


--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_signal.c

2011-11-08 Thread Rasmus Lerdorf

rasmus   Tue, 08 Nov 2011 20:32:29 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318921

Log:
This really shouldn't fail, but if it does, like on OSX under Valgrind,
let's just issue a warning.

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/zend_signal.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_signal.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_signal.c 2011-11-08 19:07:23 UTC 
(rev 318920)
+++ php/php-src/branches/PHP_5_4/Zend/zend_signal.c 2011-11-08 20:32:29 UTC 
(rev 318921)
@@ -215,7 +215,7 @@
sa.sa_mask  = global_sigmask;

if (sigaction(signo, &sa, NULL) < 0) {
-   zend_error(E_ERROR, "Error installing signal handler 
for %d", signo);
+   zend_error(E_WARNING, "Error installing signal handler 
for %d", signo);
}

/* unsure this signal is not blocked */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tokenizer/tests/bug54089.phpt branches/PHP_5_4/ext/tokenizer/tests/token_get_all_variation16.phpt branches/PHP_5_4/ext/tokenizer/tokenizer.c trunk

2011-11-08 Thread Stas Malyshev


Hi!


On Tue, Nov 8, 2011 at 5:59 AM, Stanislav Malyshev  wrote:
Hi Stas,

you meant #54089 in your comment, right?


Yes I did. Sorry, typo :)


--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ http_fopen_wrapper.c

2011-11-08 Thread Antony Dovgal

tony2001 Tue, 08 Nov 2011 16:38:56 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318914

Log:
bail out if reading HTTP headers failed

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c  
2011-11-08 16:22:19 UTC (rev 318913)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c  
2011-11-08 16:38:56 UTC (rev 318914)
@@ -719,7 +719,10 @@
char *e = http_header_line + http_header_line_length - 
1;
if (*e != '\n') {
do { /* partial header */
-   php_stream_get_line(stream, 
http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
+   if (php_stream_get_line(stream, 
http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) == NULL) {
+   
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Failed to read HTTP 
headers");
+   goto out;
+   }
e = http_header_line + 
http_header_line_length - 1;
} while (*e != '\n');
continue;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-11-08 Thread Philip Olson

philip   Tue, 08 Nov 2011 16:22:19 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318913

Log:
phpdoc karma for Gordon Oheim (gooh)

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-11-08 14:12:37 UTC (rev 318912)
+++ SVNROOT/global_avail2011-11-08 16:22:19 UTC (rev 318913)
@@ -16,7 +16,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor
+avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,gooh|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/standard/ http_fopen_wrapper.c

2011-11-08 Thread Antony Dovgal

tony2001 Tue, 08 Nov 2011 14:12:37 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318912

Log:
bail out if reading HTTP headers failed

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c

Modified: php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c  
2011-11-08 13:30:58 UTC (rev 318911)
+++ php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c  
2011-11-08 14:12:37 UTC (rev 318912)
@@ -716,7 +716,10 @@
char *e = http_header_line + http_header_line_length - 
1;
if (*e != '\n') {
do { /* partial header */
-   php_stream_get_line(stream, 
http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
+   if (php_stream_get_line(stream, 
http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) == NULL) {
+   
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Failed to read HTTP 
headers");
+   goto out;
+   }
e = http_header_line + 
http_header_line_length - 1;
} while (*e != '\n');
continue;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ http_fopen_wrapper.c

2011-11-08 Thread Antony Dovgal

tony2001 Tue, 08 Nov 2011 13:30:58 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318911

Log:
bail out if reading HTTP headers failed

Changed paths:
U   php/php-src/trunk/ext/standard/http_fopen_wrapper.c

Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2011-11-08 12:34:37 UTC 
(rev 318910)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2011-11-08 13:30:58 UTC 
(rev 318911)
@@ -716,7 +716,10 @@
char *e = http_header_line + http_header_line_length - 
1;
if (*e != '\n') {
do { /* partial header */
-   php_stream_get_line(stream, 
http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length);
+   if (php_stream_get_line(stream, 
http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) == NULL) {
+   
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Failed to read HTTP 
headers");
+   goto out;
+   }
e = http_header_line + 
http_header_line_length - 1;
} while (*e != '\n');
continue;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tokenizer/tests/bug54089.phpt branches/PHP_5_4/ext/tokenizer/tests/token_get_all_variation16.phpt branches/PHP_5_4/ext/tokenizer/tokenizer.c trunk

2011-11-08 Thread Ferenc Kovacs

On Tue, Nov 8, 2011 at 5:59 AM, Stanislav Malyshev  wrote:

> stas Tue, 08 Nov 2011 04:59:17 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=318902
>
> Log:
> Fixed bug #54084 (token_get_all with regards to __halt_compiler is not
> binary safe)
>
> Bug: https://bugs.php.net/54084 (Closed) Fix apxs Apache version test to
> work with Apache variants
>
>
Hi Stas,

you meant #54089 in your comment, right?

-- 
Ferenc Kovács
@Tyr43l - http://tyrael.hu

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.h branches/PHP_5_4/Zend/zend_vm_def.h branches/PHP_5_4/Zend/zend_vm_execute.h branches/PHP_5_4/ext/pdo/pdo_dbh.c branches/PHP_5_4/ext/pd

2011-11-08 Thread Dmitry Stogov

dmitry   Tue, 08 Nov 2011 10:11:25 +

Revision: http://svn.php.net/viewvc?view=revision&revision=318907

Log:
Fixed bug #60104 (Segmentation Fault in pdo_sqlite when using 
sqliteCreateFunction())

Bug: https://bugs.php.net/60104 (Assigned) Segmentation Fault in pdo_sqlite 
when using sqliteCreateFunction()
  
Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/zend_compile.h
U   php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h
U   php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h
U   php/php-src/branches/PHP_5_4/ext/pdo/pdo_dbh.c
U   php/php-src/branches/PHP_5_4/ext/pdo_sqlite/tests/bug60104.phpt
U   php/php-src/trunk/Zend/zend_compile.h
U   php/php-src/trunk/Zend/zend_vm_def.h
U   php/php-src/trunk/Zend/zend_vm_execute.h
U   php/php-src/trunk/ext/pdo/pdo_dbh.c
U   php/php-src/trunk/ext/pdo_sqlite/tests/bug60104.phpt

Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.h	2011-11-08 07:04:04 UTC (rev 318906)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.h	2011-11-08 10:11:25 UTC (rev 318907)
@@ -198,6 +198,9 @@
 /* function flag for internal user call handlers __call, __callstatic */
 #define ZEND_ACC_CALL_VIA_HANDLER 0x20

+/* disable inline caching */
+#define ZEND_ACC_NEVER_CACHE  0x40
+
 #define ZEND_ACC_PASS_REST_BY_REFERENCE 0x100
 #define ZEND_ACC_PASS_REST_PREFER_REF	0x200


Modified: php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h	2011-11-08 07:04:04 UTC (rev 318906)
+++ php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h	2011-11-08 10:11:25 UTC (rev 318907)
@@ -2187,7 +2187,7 @@
 zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", Z_OBJ_CLASS_NAME_P(EX(object)), function_name_strval);
 			}
 			if (OP2_TYPE == IS_CONST &&
-			EXPECTED((EX(fbc)->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0) &&
+			EXPECTED((EX(fbc)->common.fn_flags & (ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_NEVER_CACHE)) == 0) &&
 			EXPECTED(EX(object) == object)) {
 CACHE_POLYMORPHIC_PTR(opline->op2.literal->cache_slot, EX(called_scope), EX(fbc));
 			}
@@ -2284,7 +2284,7 @@
 			if (UNEXPECTED(EX(fbc) == NULL)) {
 zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", ce->name, function_name_strval);
 			}
-			if (OP2_TYPE == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0)) {
+			if (OP2_TYPE == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & (ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_NEVER_CACHE)) == 0)) {
 if (OP1_TYPE == IS_CONST) {
 	CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));
 } else {

Modified: php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h	2011-11-08 07:04:04 UTC (rev 318906)
+++ php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h	2011-11-08 10:11:25 UTC (rev 318907)
@@ -3452,7 +3452,7 @@
 			if (UNEXPECTED(EX(fbc) == NULL)) {
 zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", ce->name, function_name_strval);
 			}
-			if (IS_CONST == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0)) {
+			if (IS_CONST == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & (ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_NEVER_CACHE)) == 0)) {
 if (IS_CONST == IS_CONST) {
 	CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));
 } else {
@@ -4236,7 +4236,7 @@
 			if (UNEXPECTED(EX(fbc) == NULL)) {
 zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", ce->name, function_name_strval);
 			}
-			if (IS_TMP_VAR == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0)) {
+			if (IS_TMP_VAR == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & (ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_NEVER_CACHE)) == 0)) {
 if (IS_CONST == IS_CONST) {
 	CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));
 } else {
@@ -4899,7 +4899,7 @@
 			if (UNEXPECTED(EX(fbc) == NULL)) {
 zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", ce->name, function_name_strval);
 			}
-			if (IS_VAR == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0)) {
+			if (IS_VAR == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & (ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_NEVER_CACHE)) == 0)) {
 if (IS_CONST == IS_CONST) {
 	CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));
 } else {
@@ -5433,7 +5433,7 @@
 			if (UNEXPECTED(EX(fbc) == NULL)) {
 zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", ce->name, function_name_strval);
 			}
-			if (IS_UNUSED == IS_CONST && EXPECTED((EX(fbc)->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0)) {
+			if (I

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/package.xml branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt branches/PHP_5_3/ext/o

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_signal.c

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_signal.c

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_signal.c

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tokenizer/tests/bug54089.phpt branches/PHP_5_4/ext/tokenizer/tests/token_get_all_variation16.phpt branches/PHP_5_4/ext/tokenizer/tokenizer.c trunk

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ http_fopen_wrapper.c

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/standard/ http_fopen_wrapper.c

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ http_fopen_wrapper.c

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tokenizer/tests/bug54089.phpt branches/PHP_5_4/ext/tokenizer/tests/token_get_all_variation16.phpt branches/PHP_5_4/ext/tokenizer/tokenizer.c trunk

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.h branches/PHP_5_4/Zend/zend_vm_def.h branches/PHP_5_4/Zend/zend_vm_execute.h branches/PHP_5_4/ext/pdo/pdo_dbh.c branches/PHP_5_4/ext/pd

11 matches

Site Navigation

Mail list logo

Footer information