mirror of
https://github.com/php/php-src.git
synced 2024-10-01 23:06:11 +00:00
9a20323e19
See https://wiki.php.net/rfc/expectations Squashed commit of the following: commit3f3651a787
Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Mar 2 11:56:33 2015 +0300 opcode 137 is used for ZEND_OP_DATA and con't be reused for ZEND_ASSERT_CHECK commitca8ecabf2a
Merge:24328ac
9dac923
Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Mar 2 10:49:23 2015 +0300 Merge branch 'master' into assert * master: Update NEWS Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize) windows only test Align entries format Align entries format for 5.6.7 Align entries format for 5.5.23 Bump header year Fixed bug #69144 (strtr not replacing with partly matching replace pairs) Fixed test? Revert mktime()/gmmktime()'s arginfo Update NEWS Fixed bug #69141 Missing arguments in reflection info for some builtin functions Add NEWS entry Remove useless date warning Fix ARG_INFO for levenshtein Fix ARG_INFO for levenshtein fix dir separator in tests Update NEWS Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()). commit24328ac03f
Merge:021fd94
1cdee9a
Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Feb 27 15:57:13 2015 +0300 Merge branch 'master' into assert * master: Fixed C++ support Fixed bug #69115 crash in mail Reorder Update NEWs Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build) Update News Fixed bug #69125 (Array numeric string as key) fix bug#68942's patch Fixed ability to build unspecialized executor Fixed bug #69124 (method name could not be used when by ref) Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). commit021fd94ed1
Merge:49963eb
ace1f82
Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Feb 26 11:26:03 2015 +0300 Merge branch 'master' into assert * master: (59 commits) Improved ASSIGN_DIM handler Don't inline slow path Revert a part committted by mistake Fixed compilation warnings Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). better name Improve fix for #69038 Update NEWs Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage) Added specialized versions of DO_FCALL handler: DO_ICALL - for internal functions DO_UCALL - for user functions DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods) Use cache_slot offsets instead of indexes (simplify run-time instructions) Split INIT_FCALL_BY_NAME inti INIT_FCALL_BY_NAME(CONST+STRING) and INIT_DYNAMIC_CALL(CONST-STRING|TMPVAR|CV) Support list($a, $b) = $a Avoid unnecassary check Make zend_array_destroy() to free the corresponding zend_array Eliminate check on the fast path Make current() and key() receive argument by value. Use Firebird default home folder, replace Interbase with Firebird Updated NEWS updated NEWS ... Conflicts: Zend/zend_vm_execute.h Zend/zend_vm_opcodes.c Zend/zend_vm_opcodes.h commit49963ebf9d
Merge:07b1f92
6b77959
Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Feb 19 11:13:08 2015 +0300 Merge branch 'master' into assert * master: Implemented AST pretty-printer update NEWS to match the actual stuff in 5.6.6 update NEWS to match the actual stuff in 5.5.22 update NEWS(add missing entry for the enchant fix, and reorder the entries a bit) fix typo in bug# update NEWS fix email format update NEWS update 5.6.6 release date in NEWS Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI) BFN fix test fix test fix test Fixed bug #65593 (Segfault when calling ob_start from output buffering callback) Updated NEWS add CVE 5.4.39 next Fix associativity to match Perl Blast off to space. Conflicts: Zend/zend_ast.c commit07b1f92ed6
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 23:06:32 2015 +0300 fixed pretty-printer (support for "elseif") commit5a976c8d85
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 19:50:08 2015 +0300 Fixed vaeious ptetty-printer issues commit69491e8e8e
Merge:8473157
3ddc246
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 10:18:32 2015 +0300 Merge branch 'master' into assert * master: Set PHP_JSON_VERSION to 1.4.0 Remove unnecessary resource checks in openssl ext JSON is now maintained commit8473157fbb
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 10:17:26 2015 +0300 Fixed typo and white spaces commit96de5ffc8d
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 00:28:39 2015 +0300 Fixed assert() in namesapaces commit5eba069c28
Merge:4a2d9c0
d428bf2
Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Feb 17 22:45:55 2015 +0300 Merge branch 'master' into assert * master: (25 commits) improve debugability in TS debug builds More UPGRADING, in particular on foreach Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master Replace var is introduced abstain from using xmlCleanupParser fix TS build Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) update news Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) Port for for bug #68552 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) Update NEWS Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) - BFN Don't read the local php.ini when Generating Phar When building phar shared, you can end up loading a previous phar.so that isn't compatible with the php cli being used to generate Phar here. - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) Delete json outdated package.xml made ZEND_TSRMLS_CACHE_* macros look like function calls - Fix merge - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de ... commit4a2d9c0953
Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Feb 17 22:45:10 2015 +0300 Implemented AST pretty-printer to capture expression passed to assert() commit7a059b66d5
Merge:9973df7
3892eba
Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Feb 16 18:42:28 2015 +0300 Merge branch 'expect' of github.com:krakjoe/php-src into assert * 'expect' of github.com:krakjoe/php-src: import expect Conflicts: Zend/zend_compile.c Zend/zend_execute_API.c Zend/zend_globals.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_opcodes.c Zend/zend_vm_opcodes.h ext/opcache/Optimizer/block_pass.c ext/opcache/Optimizer/pass1_5.c ext/standard/assert.c ext/standard/tests/assert/assert_error3.phpt commit3892eba2bf
Author: krakjoe <joe.watkins@live.co.uk> Date: Sun Feb 2 12:49:35 2014 +0000 import expect
303 lines
7.0 KiB
C
303 lines
7.0 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Zend Engine |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 2.00 of the Zend license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.zend.com/license/2_00.txt. |
|
|
| If you did not receive a copy of the Zend license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@zend.com so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Andi Gutmans <andi@zend.com> |
|
|
| Zeev Suraski <zeev@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
#ifndef ZEND_GLOBALS_H
|
|
#define ZEND_GLOBALS_H
|
|
|
|
|
|
#include <setjmp.h>
|
|
|
|
#include "zend_globals_macros.h"
|
|
|
|
#include "zend_stack.h"
|
|
#include "zend_ptr_stack.h"
|
|
#include "zend_hash.h"
|
|
#include "zend_llist.h"
|
|
#include "zend_objects.h"
|
|
#include "zend_objects_API.h"
|
|
#include "zend_modules.h"
|
|
#include "zend_float.h"
|
|
#include "zend_multibyte.h"
|
|
#include "zend_arena.h"
|
|
|
|
/* Define ZTS if you want a thread-safe Zend */
|
|
/*#undef ZTS*/
|
|
|
|
#ifdef ZTS
|
|
|
|
BEGIN_EXTERN_C()
|
|
ZEND_API extern int compiler_globals_id;
|
|
ZEND_API extern int executor_globals_id;
|
|
END_EXTERN_C()
|
|
|
|
#endif
|
|
|
|
#define SYMTABLE_CACHE_SIZE 32
|
|
|
|
|
|
#include "zend_compile.h"
|
|
|
|
/* excpt.h on Digital Unix 4.0 defines function_table */
|
|
#undef function_table
|
|
|
|
#define ZEND_EARLY_BINDING_COMPILE_TIME 0
|
|
#define ZEND_EARLY_BINDING_DELAYED 1
|
|
#define ZEND_EARLY_BINDING_DELAYED_ALL 2
|
|
|
|
typedef struct _zend_declarables {
|
|
zval ticks;
|
|
} zend_declarables;
|
|
|
|
typedef struct _zend_vm_stack *zend_vm_stack;
|
|
typedef struct _zend_ini_entry zend_ini_entry;
|
|
|
|
|
|
struct _zend_compiler_globals {
|
|
zend_stack loop_var_stack;
|
|
|
|
zend_class_entry *active_class_entry;
|
|
|
|
zend_string *compiled_filename;
|
|
|
|
int zend_lineno;
|
|
|
|
zend_op_array *active_op_array;
|
|
|
|
HashTable *function_table; /* function symbol table */
|
|
HashTable *class_table; /* class table */
|
|
|
|
HashTable filenames_table;
|
|
|
|
HashTable *auto_globals;
|
|
|
|
zend_bool parse_error;
|
|
zend_bool in_compilation;
|
|
zend_bool short_tags;
|
|
|
|
zend_declarables declarables;
|
|
|
|
zend_bool unclean_shutdown;
|
|
|
|
zend_bool ini_parser_unbuffered_errors;
|
|
|
|
zend_llist open_files;
|
|
|
|
struct _zend_ini_parser_param *ini_parser_param;
|
|
|
|
uint32_t start_lineno;
|
|
zend_bool increment_lineno;
|
|
|
|
znode implementing_class;
|
|
|
|
zend_string *doc_comment;
|
|
|
|
uint32_t compiler_options; /* set of ZEND_COMPILE_* constants */
|
|
|
|
zend_string *current_namespace;
|
|
HashTable *current_import;
|
|
HashTable *current_import_function;
|
|
HashTable *current_import_const;
|
|
zend_bool in_namespace;
|
|
zend_bool has_bracketed_namespaces;
|
|
|
|
HashTable const_filenames;
|
|
|
|
zend_compiler_context context;
|
|
zend_stack context_stack;
|
|
|
|
zend_arena *arena;
|
|
|
|
zend_string *empty_string;
|
|
zend_string *one_char_string[256];
|
|
|
|
HashTable interned_strings;
|
|
|
|
const zend_encoding **script_encoding_list;
|
|
size_t script_encoding_list_size;
|
|
zend_bool multibyte;
|
|
zend_bool detect_unicode;
|
|
zend_bool encoding_declared;
|
|
|
|
zend_ast *ast;
|
|
zend_arena *ast_arena;
|
|
|
|
zend_stack delayed_oplines_stack;
|
|
|
|
#ifdef ZTS
|
|
zval **static_members_table;
|
|
int last_static_member;
|
|
#endif
|
|
};
|
|
|
|
|
|
struct _zend_executor_globals {
|
|
zval uninitialized_zval;
|
|
zval error_zval;
|
|
|
|
/* symbol table cache */
|
|
zend_array *symtable_cache[SYMTABLE_CACHE_SIZE];
|
|
zend_array **symtable_cache_limit;
|
|
zend_array **symtable_cache_ptr;
|
|
|
|
zend_array symbol_table; /* main symbol table */
|
|
|
|
HashTable included_files; /* files already included */
|
|
|
|
JMP_BUF *bailout;
|
|
|
|
int error_reporting;
|
|
int exit_status;
|
|
|
|
HashTable *function_table; /* function symbol table */
|
|
HashTable *class_table; /* class table */
|
|
HashTable *zend_constants; /* constants table */
|
|
|
|
zval *vm_stack_top;
|
|
zval *vm_stack_end;
|
|
zend_vm_stack vm_stack;
|
|
|
|
struct _zend_execute_data *current_execute_data;
|
|
zend_class_entry *scope;
|
|
|
|
zend_long precision;
|
|
|
|
int ticks_count;
|
|
|
|
HashTable *in_autoload;
|
|
zend_function *autoload_func;
|
|
zend_bool full_tables_cleanup;
|
|
|
|
/* for extended information support */
|
|
zend_bool no_extensions;
|
|
|
|
#ifdef ZEND_WIN32
|
|
zend_bool timed_out;
|
|
OSVERSIONINFOEX windows_version_info;
|
|
#endif
|
|
|
|
HashTable regular_list;
|
|
HashTable persistent_list;
|
|
|
|
int user_error_handler_error_reporting;
|
|
zval user_error_handler;
|
|
zval user_exception_handler;
|
|
zend_stack user_error_handlers_error_reporting;
|
|
zend_stack user_error_handlers;
|
|
zend_stack user_exception_handlers;
|
|
|
|
zend_error_handling_t error_handling;
|
|
zend_class_entry *exception_class;
|
|
|
|
/* timeout support */
|
|
zend_long timeout_seconds;
|
|
|
|
int lambda_count;
|
|
|
|
HashTable *ini_directives;
|
|
HashTable *modified_ini_directives;
|
|
zend_ini_entry *error_reporting_ini_entry;
|
|
|
|
zend_objects_store objects_store;
|
|
zend_object *exception, *prev_exception;
|
|
const zend_op *opline_before_exception;
|
|
zend_op exception_op[3];
|
|
|
|
struct _zend_module_entry *current_module;
|
|
|
|
zend_bool active;
|
|
zend_bool valid_symbol_table;
|
|
|
|
zend_long assertions;
|
|
|
|
uint32_t ht_iterators_count; /* number of allocatd slots */
|
|
uint32_t ht_iterators_used; /* number of used slots */
|
|
HashTableIterator *ht_iterators;
|
|
HashTableIterator ht_iterators_slots[16];
|
|
|
|
void *saved_fpu_cw_ptr;
|
|
#if XPFPA_HAVE_CW
|
|
XPFPA_CW_DATATYPE saved_fpu_cw;
|
|
#endif
|
|
|
|
void *reserved[ZEND_MAX_RESERVED_RESOURCES];
|
|
};
|
|
|
|
struct _zend_ini_scanner_globals {
|
|
zend_file_handle *yy_in;
|
|
zend_file_handle *yy_out;
|
|
|
|
unsigned int yy_leng;
|
|
unsigned char *yy_start;
|
|
unsigned char *yy_text;
|
|
unsigned char *yy_cursor;
|
|
unsigned char *yy_marker;
|
|
unsigned char *yy_limit;
|
|
int yy_state;
|
|
zend_stack state_stack;
|
|
|
|
char *filename;
|
|
int lineno;
|
|
|
|
/* Modes are: ZEND_INI_SCANNER_NORMAL, ZEND_INI_SCANNER_RAW, ZEND_INI_SCANNER_TYPED */
|
|
int scanner_mode;
|
|
};
|
|
|
|
struct _zend_php_scanner_globals {
|
|
zend_file_handle *yy_in;
|
|
zend_file_handle *yy_out;
|
|
|
|
unsigned int yy_leng;
|
|
unsigned char *yy_start;
|
|
unsigned char *yy_text;
|
|
unsigned char *yy_cursor;
|
|
unsigned char *yy_marker;
|
|
unsigned char *yy_limit;
|
|
int yy_state;
|
|
zend_stack state_stack;
|
|
zend_ptr_stack heredoc_label_stack;
|
|
|
|
/* original (unfiltered) script */
|
|
unsigned char *script_org;
|
|
size_t script_org_size;
|
|
|
|
/* filtered script */
|
|
unsigned char *script_filtered;
|
|
size_t script_filtered_size;
|
|
|
|
/* input/output filters */
|
|
zend_encoding_filter input_filter;
|
|
zend_encoding_filter output_filter;
|
|
const zend_encoding *script_encoding;
|
|
|
|
/* initial string length after scanning to first variable */
|
|
int scanned_string_len;
|
|
};
|
|
|
|
#endif /* ZEND_GLOBALS_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: t
|
|
* End:
|
|
*/
|