[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h main/main.c

2013-08-13 Thread Xinchen Hui 
Commit:b6fa0b40f7e1f942febdc35513f310a5880c4eb0
Author:Xinchen Hui larue...@php.net Wed, 14 Aug 2013 11:44:53 
+0800
Parents:   f95cd93408997bd03e1811060d1f25680dc66607 
f3d18add089113a032d785169a6859c8719db307
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b6fa0b40f7e1f942febdc35513f310a5880c4eb0

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h
  MM  main/main.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-08-06 Thread Xinchen Hui 
Commit:9b38673776fdd2501119acea04f9c5869a007cf1
Author:Xinchen Hui larue...@php.net Tue, 6 Aug 2013 15:39:46 +0800
Parents:   ca0497bbac282c39048776a9f61052e67643 
aa042d0c351056d4ee5ecc994cd596f7fbb427ea
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9b38673776fdd2501119acea04f9c5869a007cf1

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-08-02 Thread Xinchen Hui 
Commit:78673d1badd39362dff15d4124d7df0cbcec862f
Author:Xinchen Hui larue...@php.net Fri, 2 Aug 2013 18:39:58 +0800
Parents:   fbd01eaecf5685911166f406a14a118acf345acf 
6f1a762fab8dc42b0d2190cb3cbf89da8e0903e5
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=78673d1badd39362dff15d4124d7df0cbcec862f

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-07-13 Thread Xinchen Hui 
Commit:75808151e378cc0d9e3a8028011d6e00143fff3e
Author:Xinchen Hui larue...@php.net Sun, 14 Jul 2013 12:01:50 
+0800
Parents:   b64e2218f2c6fac302cfe2900f525f084e382935 
e20fc854540716117aea5e169cf2a5cbb4af0a56
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=75808151e378cc0d9e3a8028011d6e00143fff3e

Log:
Merge branch 'PHP-5.5'

Conflicts:
Zend/zend_vm_execute.h

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:
diff --cc Zend/zend_vm_execute.h
index c947c3e,f7d7301..a6fec47
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -15796,9 -15804,11 +15822,11 @@@ static int ZEND_FASTCALL  ZEND_UNSET_VA
} else if (IS_VAR == IS_VAR || IS_VAR 
== IS_CV) {
zval_ptr_dtor(varname);
}
 -  if (free_op1.var) 
{zval_ptr_dtor(free_op1.var);};
 +  zval_ptr_dtor(free_op1.var);
-   CHECK_EXCEPTION();
-   ZEND_VM_NEXT_OPCODE();
+   HANDLE_EXCEPTION();
+   }
+   if (UNEXPECTED(ce == NULL)) {
+   zend_error_noreturn(E_ERROR, Class 
'%s' not found, Z_STRVAL_P(opline-op2.zv));
}
CACHE_PTR(opline-op2.literal-cache_slot, ce);
}
@@@ -20360,9 -20384,11 +20392,11 @@@ static int ZEND_FASTCALL  ZEND_UNSET_VA
} else if (IS_VAR == IS_VAR || IS_VAR 
== IS_CV) {
zval_ptr_dtor(varname);
}
 -  if (free_op1.var) 
{zval_ptr_dtor(free_op1.var);};
 +  zval_ptr_dtor(free_op1.var);
-   CHECK_EXCEPTION();
-   ZEND_VM_NEXT_OPCODE();
+   HANDLE_EXCEPTION();
+   }
+   if (UNEXPECTED(ce == NULL)) {
+   zend_error_noreturn(E_ERROR, Class 
'%s' not found, Z_STRVAL_P(opline-op2.zv));
}
CACHE_PTR(opline-op2.literal-cache_slot, ce);
}
@@@ -21781,9 -21807,11 +21817,11 @@@ static int ZEND_FASTCALL  ZEND_UNSET_VA
} else if (IS_VAR == IS_VAR || IS_VAR 
== IS_CV) {
zval_ptr_dtor(varname);
}
 -  if (free_op1.var) 
{zval_ptr_dtor(free_op1.var);};
 +  zval_ptr_dtor(free_op1.var);
-   CHECK_EXCEPTION();
-   ZEND_VM_NEXT_OPCODE();
+   HANDLE_EXCEPTION();
+   }
+   if (UNEXPECTED(ce == NULL)) {
+   zend_error_noreturn(E_ERROR, Class 
'%s' not found, Z_STRVAL_P(opline-op2.zv));
}
CACHE_PTR(opline-op2.literal-cache_slot, ce);
}


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-06-08 Thread Xinchen Hui 
Commit:46005788304ea406dbc1f5f21cc76456fecc8594
Author:Xinchen Hui larue...@php.net Sun, 9 Jun 2013 13:50:06 +0800
Parents:   2c0f09540e18371387eb291906f19b8b94e1ca5a 
6139358804ce41df3bbe54a7e8df6c6eb303c8b6
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=46005788304ea406dbc1f5f21cc76456fecc8594

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-04-23 Thread Dmitry Stogov 
Commit:302de03a5abb5e51345cbc1a4074987e4680cbc0
Author:Dmitry Stogov dmi...@zend.com Wed, 24 Apr 2013 00:04:00 
+0400
Parents:   92a164069441a4259211bb702a38077e05344483 
758b666c0ad6edb48274858d2e11c53460787b88
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=302de03a5abb5e51345cbc1a4074987e4680cbc0

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when 
EX(function_state).function is not yet set to the calling function.

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-04-11 Thread Xinchen Hui 
Commit:bcb223a6264fcf1f732097b97d45e30542cc17cd
Author:Xinchen Hui larue...@php.net Thu, 11 Apr 2013 14:29:51 
+0800
Parents:   e2f3c7f2bc3853bb485b5a84abcef1958a96ccee 
a5cfe57e08f3d3e48276f535d12ce6e6758451bf
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=bcb223a6264fcf1f732097b97d45e30542cc17cd

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-03-25 Thread Dmitry Stogov 
Commit:a4c386f32ce8b8141ad4e8c70f53ea1aba1a1ffc
Author:Dmitry Stogov dmi...@zend.com Mon, 25 Mar 2013 15:48:13 
+0400
Parents:   d74a192bd4b59da4525878f538de59d22a5a9ca7 
96e5f5eb05af913f8a9b9297393f153c561bf51b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a4c386f32ce8b8141ad4e8c70f53ea1aba1a1ffc

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions 
properly). (Jeff Welch)

Bugs:
https://bugs.php.net/63914

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-03-25 Thread Xinchen Hui 
Commit:c2afd2765bb26f25f265c3c76a1e9918b2f341e2
Author:Xinchen Hui larue...@php.net Tue, 26 Mar 2013 12:03:37 
+0800
Parents:   c356038c6eb1d970e716067aaf259c21131f963e 
ed315823019c8111847fb9a24293dc758ead7c3a
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=c2afd2765bb26f25f265c3c76a1e9918b2f341e2

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-03-14 Thread Dmitry Stogov 
Commit:22b0f5d82904cf1da3b0b2515670e272f4798139
Author:Dmitry Stogov dmi...@zend.com Thu, 14 Mar 2013 14:22:51 
+0400
Parents:   37664354e532263ad35c137cc3a4c6a5bf9c4455 
dd1c358d1bf8fd492e39d46f93878d47a3b6d257
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=22b0f5d82904cf1da3b0b2515670e272f4798139

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Removed redundand code

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/zip/php_zip.c

2013-02-21 Thread Stanislav Malyshev 
Commit:4c293bfe91c69d69e7bb625165fff601a5d35f4b
Author:Stanislav Malyshev s...@php.net Thu, 21 Feb 2013 00:57:52 
-0800
Parents:   b7f89bc70118db6481196e343dc9c244bca022b0 
76160319a5dca00b8b9e0eb69e945b2b703b0852
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4c293bfe91c69d69e7bb625165fff601a5d35f4b

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  news for bug #49348
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read

Bugs:
https://bugs.php.net/49348

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h
  MM  ext/zip/php_zip.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-02-16 Thread Xinchen Hui 
Commit:92046b7ef17e40c5d38403b69c5691794ab0202e
Author:Xinchen Hui larue...@php.net Sat, 16 Feb 2013 22:25:37 
+0800
Parents:   dd304c8e194d65ec72b514fd2d191dadef9ba9a9 
75742d57eb34c2c1c4d23d55f9b9ee44939b32c2
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=92046b7ef17e40c5d38403b69c5691794ab0202e

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-02-07 Thread Xinchen Hui 
Commit:7fb07acf98a28977b716aea3134d8ad273f3144d
Author:Xinchen Hui larue...@php.net Thu, 7 Feb 2013 23:46:15 +0800
Parents:   67ccb99f2ccba3abfdb25aafff6d3d3a399426de 
ee825e0b42d9fec9b1f2e999b691c6eedf46fdd1
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7fb07acf98a28977b716aea3134d8ad273f3144d

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-01-23 Thread Gustavo André dos Santos Lopes 
Commit:ddc98aa814fe2e540029ee28cf01e54a5c328359
Author:Gustavo Lopes glo...@nebm.ist.utl.pt Wed, 23 Jan 2013 
13:26:15 +0100
Parents:   40d9075677de0087256a467331eb09d12ad3 
fc7b054c2d3aa0855c69b50dd7d386d558d6317e
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ddc98aa814fe2e540029ee28cf01e54a5c328359

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #64023 (__toString()  SplFileInfo)

Bugs:
https://bugs.php.net/64023

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-01-18 Thread Lars Strojny 
Commit:b1ddfcbee33b3793c1a0ad12992bbce21df42d45
Author:Lars Strojny lstro...@php.net Sat, 19 Jan 2013 01:01:39 
+0100
Parents:   f02373fc5a89a6819ea3e760756882c928b625e3 
8991ed016fa257c9f8ba42580c34568b3c2ce3e5
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b1ddfcbee33b3793c1a0ad12992bbce21df42d45

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-01-14 Thread Xinchen Hui 
Commit:f6260b36dd5760bc2e3854db76f829fda54fe6df
Author:Xinchen Hui larue...@php.net Mon, 14 Jan 2013 16:24:26 
+0800
Parents:   5c7ae74f1098c6fe9555fc8d8dcad3a565e6a089 
62059c16ee2f2802caa00f2aad2fa44c867dd1f1
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f6260b36dd5760bc2e3854db76f829fda54fe6df

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2012-12-20 Thread Nikita Popov 
Commit:4509016309402b58bd7228bb215537c7ae70c0dc
Author:Nikita Popov ni...@php.net Fri, 21 Dec 2012 01:58:29 +0100
Parents:   68730388ae9f76a4a168da8c5b5a52c36b5a 
ffb848b275a085917413c171a79cbfdb1d0159d2
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4509016309402b58bd7228bb215537c7ae70c0dc

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2012-12-18 Thread Nikita Popov 
Commit:5f7c478d53244dc21a97deb93714decf2e96f0ae
Author:Nikita Popov ni...@php.net Tue, 18 Dec 2012 21:41:55 +0100
Parents:   2041e0dc18c66f649719d32f3707956ada3607ce 
d53f1bf8ab326a6fd3596a5f265d04bf49de74fe
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=5f7c478d53244dc21a97deb93714decf2e96f0ae

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



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