]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Tue, 2 Jul 2019 11:19:25 +0000 (13:19 +0200)
committerJoe Watkins <krakjoe@php.net>
Tue, 2 Jul 2019 11:19:25 +0000 (13:19 +0200)
* PHP-7.4:
  simple ignore arguments in exceptions implementation

1  2 
Zend/zend.c
Zend/zend_exceptions.c
Zend/zend_globals.h
php.ini-development
php.ini-production

diff --cc Zend/zend.c
Simple merge
Simple merge
index 281450f3fe8e7ff12cd4db20a7e5dce9dd9bbcb2,1d427fe4788426cceed4d2dbdce16adba92dc02c..cfaf3bd1dd79028445192c69bac06fa16d77556f
@@@ -232,8 -232,12 +232,10 @@@ struct _zend_executor_globals 
        zend_function trampoline;
        zend_op       call_trampoline_op;
  
 -      zend_bool each_deprecation_thrown;
 -
        HashTable weakrefs;
  
+       zend_bool exception_ignore_args;
        void *reserved[ZEND_MAX_RESERVED_RESOURCES];
  };
  
Simple merge
Simple merge