archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
80653 commits 526 branches 1434 tags 865 MiB
Commit graph

218 commits

Author SHA1 Message Date
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
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
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
72c287bd23 Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
Dmitry Stogov
3d17219cd8 Refactored zend_hash_* iteration API zend_hash_fove_forward_ex(ht, pos) and family require second argument to be real pointer. 
&(ht)->nInternalPointer should be passed instead of NULL.
zend_hash_update_current_key() may work only with internal pointer.
 2014-04-07 23:14:17 +04:00
Dmitry Stogov
76cc99fe60 Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) 2014-04-03 15:26:23 +04:00
Xinchen Hui
069c158c20 Fixed php_info related 2014-03-02 21:31:38 +08:00
Dmitry Stogov
5de7115679 Use better data structures (incomplete; able to run bench.php) 2014-02-18 16:27:38 +04:00
Dmitry Stogov
2b9b9afa7a Use better data structures (incomplete) 2014-02-17 17:59:18 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Andrey Hristov
1c7f54d4f7 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	ext/openssl/xp_ssl.c
 2014-01-29 15:32:02 +02:00
Remi Collet
da84f3af75 Fixed Request #66574 Allow multiple paths in php_ini_scanned_path 
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.

In some case it could be useful to allow multiple.

In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).

For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d   php
PHP_INI_SCAN_DIR=:/myproject/php.d       php
PHP_INI_SCAN_DIR=/myproject/php.d:       php

Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.
 2014-01-29 09:53:22 +01:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Kalle Sommer Nielsen
bd58146ad6 Kill another TSRMLS_FETCH() in the zend extension loading code 2013-12-18 07:59:47 +01:00
Anatol Belski
e7a4cf8d7e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix buffer overrun
 2013-07-15 17:35:29 +02:00
Anatol Belski
9561e598a0 fix buffer overrun 2013-07-15 17:34:36 +02:00
David Soria Parra
c542e969f2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix typos
 2013-03-19 15:11:48 +01:00
Carson McDonald
c6f6bf88d8 Fix typos 2013-03-19 15:11:34 +01:00
Dmitry Stogov
0b8b6a727d Added ability to load zend_extensions without absolute path names 2013-03-17 11:42:25 +04:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Xinchen Hui
b5766cdcac Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
5aa1fb6074 Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
0420858004 Merge -r317306 to trunk 2011-12-07 10:28:56 +00:00
Pierre Joye
d435ddbe52 - be sure to check if the var ha not been removed between the two calls 2011-09-26 08:49:28 +00:00
Rasmus Lerdorf
6379f87b31 Fix another Coverity warning by initializing this to NULL prior to the strtok_r call 2011-08-06 21:10:29 +00:00
Rasmus Lerdorf
1bc34a491c Fix another Coverity warning by initializing this to NULL prior to the strtok_r call 2011-08-06 21:10:29 +00:00
Pierre Joye
801d140782 - fix bug #54204, Can't set a value with a PATH section in php.ini 2011-07-18 10:25:36 +00:00
Pierre Joye
ba22d8a37b - fix bug #54204, Can't set a value with a PATH section in php.ini 2011-07-18 10:25:36 +00:00
Pierre Joye
458ce08ab3 - path len check and fix buffer overrun 2011-01-19 14:21:46 +00:00
Pierre Joye
52aa5735f1 - path len sanity check 2011-01-17 14:29:16 +00:00
Pierre Joye
80e5f0f774 - remove local redeclaration 2011-01-10 08:28:47 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Jérôme Loyet
e1b87cce1f - Fixed #52045 (FPM tries to open php.ini from the current dir) 
- Add php_ini_ignore_cwd to _sapi_module_struct
 2010-11-11 17:24:27 +00:00
Adam Harvey
02b2a28882 Fix bug #52786 (PHP should reset section to [PHP] after ini sections). Patch by 
Fedora at famillecollet dot com.
 2010-09-09 05:11:05 +00:00
Felipe Pena
1fc65cbf03 - Fixed crash on non-Windows build 2010-08-30 21:34:54 +00:00
Pierre Joye
2721bbfcf9 - fix possible leak and error while fetching PHPRC 2010-08-30 17:05:56 +00:00
Antony Dovgal
01f828ebb0 fix bug #51276 (php_load_extension() is missing when HAVE_LIBDL is undefined) 2010-06-08 12:54:11 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Jani Taskinen
e421bee7af - Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories) 2010-01-16 21:01:12 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Pierre Joye
e4adfe4f61 - #48779, fix another use case where / usage may differ 2009-10-15 13:09:25 +00:00
Pierre Joye
e5d4b019b9 - #48779, improve fix, drop usage of _tolower and use zend_strtolower 2009-10-12 14:40:27 +00:00
Pierre Joye
112379ba24 - fix possible issue in TS environment (we don't have to do that anymore anyway in 5.3+) 2009-10-11 21:04:35 +00:00
Pierre Joye
4d63bd1132 - #48779, don't loop twice over the path chars 2009-10-11 20:50:53 +00:00
Felipe Pena
994307d429 - Fixed build and comment-style 2009-10-09 20:01:16 +00:00
Garrett Serack
8e5a00e546 - changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case insensitive (garretts) 2009-10-09 19:43:00 +00:00
Derick Rethans
d29d24427f - MFH: Get rid of the four different versions of zend_extension* and only use 
zend_extension. Because of the API identifier change in PHP 5.3 you also get
  a proper warning message now.
#- [DOC]
 2009-05-18 21:33:38 +00:00