[PHP-CVS] com php-src: Merge branch 'PHP-5.4': Zend/zend_compile.c Zend/zend_compile.h Zend/zend_opcode.c

[Dmitry Stogov]

Commit:    bceec038c833d830a3f37d4eb14a778104eb2766
Author:    Dmitry Stogov <dmi...@zend.com>         Wed, 5 Sep 2012 10:01:04 
+0400
Parents:   061f3799eb0b9e41b605d9416edc6c68ea08b2eb 
6c0508f8d5d5a62adb37a76bc682c94540199ee3
Branches:  master

Advertising

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

Log:
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62907 (Double free when use traits)

Conflicts:
        NEWS

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

Changed paths:
  MM  Zend/zend_compile.c
  MM  Zend/zend_compile.h
  MM  Zend/zend_opcode.c


Diff:



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