Anatol Belski
c444c4172f
further cleanups with S_IF* macros generalized declarations
2015-05-25 18:03:28 +02:00
Nikita Popov
40e465e357
Clean up some type conversions
...
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
2015-04-27 18:50:08 +02:00
Dmitry Stogov
2fa8d67a5c
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.
2015-03-04 02:05:28 +03:00
Dmitry Stogov
1eb4352143
Use new ZEND_HASH_FOREACH_... API.
2015-02-10 15:43:12 +03:00
Michael Wallner
570ed1a1a4
fix warnings
2015-01-30 22:32:00 +01:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Nikita Popov
2d212b426a
Drop duplicate arg from hash_get_current_key_ex
2014-12-26 21:06:18 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
b35555f6cd
fix datatype mismatches
2014-12-02 09:15:11 +01:00
Anatol Belski
e99040659e
fix datatype mismatches and warns
2014-10-27 16:38:48 +01:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
481bf25b6a
restore the length var and fix the com_dotnet ini
2014-09-01 20:34:33 +02:00
Dmitry Stogov
88d7ca44f6
Refactored INI subsystem to use zend_string* instead of char*
2014-09-01 20:57:33 +04:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
8ee2a4a9b5
first shot on merging the core fro the int64 branch
2014-08-16 11:16:11 +02:00
Xinchen Hui
c242518bf0
There should been memory leaks(and don't use pointer cast)
2014-05-08 15:20:13 +08:00
Pierre Joye
38c886a449
-- missing length declaration, may have worked w/some gcc as length is not used in the macro but still need it, ifdef just make code uncertain. will get opt out anyway if not used
2014-05-07 07:31:21 +02:00
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
