summaryrefslogtreecommitdiff
path: root/main/php_globals.h
Commit message (Collapse)AuthorAgeFilesLines
* Rehash function table after disabling functionsNikita Popov2020-08-281-1/+0
| | | | | | | | | | | | To perform fast shutdown without full table cleanup we need all internal functions to be in one continuous chunk. This was violated when functions were deleted via disable_functions. This drops the zend_disable_function() API in favor of zend_disable_functions(), which disables the given list of functions and performs the necessary rehash afterwards. Also drop PG(disabled_functions), which is no longer used.
* Fix incorrect zend_bool usage for display_errorsGeorge Peter Banyard2020-06-091-1/+1
|
* Pass zend_string message to zend_error_cbNikita Popov2020-06-051-1/+1
| | | | | | | | | | | | | | This makes the zend_error_cb API simpler, and avoid formatting the same message in multiple places. It should be noted that the passed zend_string is always non-persistent, so if you want to store it persistently somewhere, you may still need to duplicate it. The last_error_message is cleared a bit more aggressive, to make sure it doesn't hang around across allocator life-cycles. Closes GH-5639.
* Remove mention of PHP major version in Copyright headersGabriel Caruso2019-09-251-2/+0
| | | | Closes GH-4732.
* Merge branch 'PHP-7.4'Dmitry Stogov2019-03-141-1/+2
|\ | | | | | | | | * PHP-7.4: Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
| * Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.Dmitry Stogov2019-03-141-1/+2
| |
* | Merge branch 'PHP-7.4'Peter Kokot2019-02-031-9/+0
|\ \ | |/ | | | | | | * PHP-7.4: Remove local variables
| * Remove local variablesPeter Kokot2019-02-031-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
| * Remove yearly range from copyright noticeZeev Suraski2019-01-301-1/+1
| |
* | Remove year range from copyright noticeZeev Suraski2019-01-301-1/+1
| |
* | Remove track_errors and $php_errormsgNikita Popov2019-01-281-1/+0
|/ | | | | This has been deprecated in PHP 7.2 as part of https://wiki.php.net/rfc/deprecations_php_7_2.
* Future-proof email addresses...Zeev Suraski2018-11-011-1/+1
|
* Remove unused Git attributes identPeter Kokot2018-07-251-2/+0
| | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* Add syslog.filter INI for filtering syslog messagesPhilip Prindeville2018-07-221-0/+1
| | | | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* Add syslog's ident and facility parameters to configPhilip Prindeville2018-07-011-0/+4
| | | | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
* Remove padding just merged since 7.3 isn't released yet.Sara Golemon2018-01-231-5/+0
| | | | Also bump PHP_API_VERSION since the struct size has changed.
* Merge branch 'PHP-7.1' into PHP-7.2Sara Golemon2018-01-231-0/+5
|\ | | | | | | | | * PHP-7.1: Fix alignment of PG struct cause by ignore_user_abort big endian fix
| * Fix alignment of PG struct cause by ignore_user_abort big endian fixSara Golemon2018-01-231-0/+5
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Sara Golemon2018-01-231-1/+1
|\ \ | |/ | | | | | | * PHP-7.1: BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
| * BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBoolSara Golemon2018-01-231-1/+1
| |
| * year++Xinchen Hui2018-01-021-1/+1
| |
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | year++Xinchen Hui2018-01-021-1/+1
| |
* | sync vim mode lines in mainAnatol Belski2017-07-091-0/+2
| |
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
| |
* | Remove sql.safe_modeKalle Sommer Nielsen2016-08-111-1/+0
|/ | | | | | | | | | This is one of the last old and odd deprecated settings we still have in PHP, it was never fully implemented in all the database extensions and should probably have been gone back in 5.4, along with safe_mode. Although if my memory strikes me right, mysql was also supporting it back then, but not mysqli. So far only interbase was supporting this feature, and the removal of it causes two effects for interbase: - CREATE DATABASE is now allowed no matter - The default database set by php.ini (ibase.default_db) is no longer forced http://php.net/ini.core#ini.sql.safe-mode
* Safe execution timeout handling.Dmitry Stogov2016-04-201-1/+0
|
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
| * bump yearXinchen Hui2015-01-151-1/+1
| |
* | Fix for #66048Julien Pauli2015-05-121-0/+2
| |
* | bump yearXinchen Hui2015-01-151-1/+1
| |
* | trailing whitespace removalStanislav Malyshev2015-01-101-1/+1
| |
* | force more static tsrmls cache usageAnatol Belski2014-10-071-1/+1
| |
* | reworked the patch, less new stuff but workyAnatol Belski2014-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
* | native tls initial patchkrakjoe2014-09-201-1/+1
| |
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | master renames phase 1Anatol Belski2014-08-251-10/+10
| |
* | first shot on merging the core fro the int64 branchAnatol Belski2014-08-161-10/+10
| |
* | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * \ Merge branch 'PHP-5.6'Yasuo Ohgaki2014-02-131-0/+4
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Implement RFC https://wiki.php.net/rfc/default_encoding
| | * Implement RFC https://wiki.php.net/rfc/default_encodingYasuo Ohgaki2014-02-131-0/+4
| | |
* | | Use better data structures (incomplete)Dmitry Stogov2014-02-101-1/+1
|/ /
* | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-1/+1
|\ \ | |/
| * Bump yearXinchen Hui2014-01-031-1/+1
| |
| * fix typeMichael Wallner2013-12-301-1/+1
| |
| * re-introduce always_populate_raw_post_dataMichael Wallner2013-12-301-0/+1
|/
* slim post dataMichael Wallner2013-08-271-1/+0
|
* Implemented Feature #60524 (sys_temp_dir)ALeX Kazik2013-01-281-0/+1
| | | | | | | | | | | | Added a new configuration directive which allows it to change the temporary directory, the default behavior is unchanged. This is a useful option if you use all/some hosts inside of one .ini file with sections and want to change the temp dir per user (maybe it's not allowed to write outside the users home directory). Since the TMPDIR variable affects the whole php that way can not be used for this scenario. (see https://bugs.php.net/bug.php?id=60524)
* Happy New YearXinchen Hui2013-01-011-1/+1
|