Bob Weinand
09da8952d0
Merge remote-tracking branch 'origin/PHP-5.6'
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_parser.c
sapi/phpdbg/phpdbg_parser.h
sapi/phpdbg/phpdbg_prompt.c
2014-10-27 00:34:56 +01:00
Bob Weinand
50756b515c
Do not execute anything after quit or clean command
2014-10-27 00:00:19 +01:00
Bob Weinand
190f4f9f18
Fix last commit, and do not output unnecessary information
2014-10-27 00:00:18 +01:00
Bob Weinand
3ab7734b88
Stabilize execution, always run destructors and extended file breakpoints
2014-10-27 00:00:16 +01:00
Bob Weinand
69bc61de41
Fix nullptr dereference in clean without exec context
2014-10-27 00:00:15 +01:00
krakjoe
41537cdddc
remove dodgy param parser, bring userland breakpoint api inline with PHP7
2014-10-27 00:00:14 +01:00
krakjoe
51c1cc4ff5
disable output buffering by default
2014-10-27 00:00:14 +01:00
Bob Weinand
cc70ec1e67
Add question to reset execution in run/exec/clean
2014-10-27 00:00:13 +01:00
krakjoe
8ba69820f7
actually remove this
2014-10-26 07:05:55 +00:00
krakjoe
29446f2f04
disable output buffering, better breakpoint api for userland, remove hand parsing of params
2014-10-26 07:02:15 +00:00
Bob Weinand
044f37a832
Merge remote-tracking branch 'origin/PHP-5.6'
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_list.c
2014-10-25 19:09:19 +02:00
Bob Weinand
24babb0194
Merge phpdbg into PHP-5.6
2014-10-25 18:59:48 +02:00
Bob Weinand
2bcac53bca
Made phpdbg compatible with new engine
2014-10-24 19:29:50 +02:00
Bob Weinand
9b4d9ac6c7
Merge phpdbg into PHP-5.6
2014-10-24 19:22:45 +02:00
Anatol Belski
65eb8ef8d0
fix several datatype mismatch warnings
2014-10-13 18:43:14 +02:00
Anatol Belski
97319bc833
fix signed/unsigned mismatch
2014-10-13 18:43:10 +02:00
Anatol Belski
6075e5a549
fix signed/unsigned mismatch warning
2014-10-10 19:00:18 +02:00
Anatol Belski
3942ed52be
fix compilation warning
2014-10-10 19:00:17 +02:00
Dmitry Stogov
7c7b9184b1
Fixed list() behavior inconsistency (string handling is disabled for all cases, ArrayAccess objects handling is enabled for all cases, ZEND_FETCH_DIM_TMP_VAR opcode is renamed into ZEND_FETCH_LIST, ZEND_FETCH_ADD_LOCK flag is removed).
2014-10-05 13:02:58 +04:00
George Wang
2fd7d60ea0
Merge branch 'master' of git.php.net:php-src
2014-10-03 16:43:58 -04:00
George Wang
0e18003374
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-10-03 16:43:35 -04:00
George Wang
a7d2747890
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:42 -04:00
George Wang
5b08e56eca
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:27 -04:00
Ferenc Kovacs
e13e305b93
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS entry for previous commit
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:40:05 +02:00
Ferenc Kovacs
200e407b24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:39:09 +02:00
Robin Gloster
15ba757a2b
add IPv6 support to php-fpm
2014-10-03 11:35:27 +02:00
Anatol Belski
4b3e198023
removed *.dsw and *.dsp files
2014-09-28 19:02:09 +02:00
Johannes Schlüter
f13da5b0d7
Merge branch 'PHP-5.6'
2014-09-27 02:18:54 +02:00
Johannes Schlüter
16b4167fdd
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-27 02:18:29 +02:00
Johannes Schlüter
e6105ffb22
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-27 02:17:52 +02:00
Johannes Schlüter
2711948d14
This test should pass
2014-09-27 02:17:26 +02:00
Dmitry Stogov
06103d65b1
Use zval_ptr_dtor_nogc() to free IS_TMP_VAR operands.
...
Removed ZEND_SWITCH_FREE opcode (ZEND_FREE used instead).
2014-09-23 17:21:29 +04:00
Nikita Popov
e33f3d3b7c
Move smart_str implementation into Zend/
...
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Florian MARGAINE
268bcdc1cb
Removes accidentally added files.
2014-09-20 18:27:09 +02:00
Florian MARGAINE
8eb7e7bf7f
Merge branch 'master' into issue-67910
...
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
58ed832fc9
Deletes patch leftovers
2014-09-20 10:03:54 +02:00
Florian MARGAINE
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
Nikita Popov
31e842472f
Make number printing functions less generic
...
Now that zend_ulong is 64bit on 64bit platforms, it should be
sufficient to always use it, rather than supporting multiple
types.
API changes:
* _zend_print_unsigned_to_buf and _zend_print_signed_to_buf
no longer exist.
* smart_str(ing)_print_long and smart_str(ing)_print_unsigned
no longer exist.
* Instead of all these, zend_print_ulong_to_buf and
zend_print_long_to_buf should be used.
* smart_str_append_generic_ex no longer exists.
* smart_str(ing)_append_off_t(_ex) no longer exists, use
smart_str(ing)_append_long(_ex) instead.
2014-09-19 23:39:07 +02:00
Nikita Popov
37aaccad7d
Use inline functions for most of smart_str
...
smart_str_free_ex no longer exists, always use smart_str_free instead.
smart_str_alloc no longer requires a newlen variable to be in scope,
instead it returns the new length.
2014-09-19 23:39:07 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
jfha73
b0064fc27f
Update sapi_apache2.c
...
Change of php5 for php7
2014-09-18 20:43:31 +02:00
jfha73
1d936e7054
Update php_functions.c
2014-09-18 20:43:30 +02:00
jfha73
5514b0b1ad
Update php_apache.h
2014-09-18 20:43:28 +02:00
jfha73
637a0069aa
Update and rename php5apache2.dsp to php7apache2.dsp
...
Change of php5 for php7
2014-09-18 20:43:27 +02:00
jfha73
f8aeb6fc43
Update php.sym
...
Change of php5 for php7
2014-09-18 20:43:26 +02:00
jfha73
0e4ab8456a
Update and rename mod_php5.c to mod_php7.c
...
Change of php5 for php7
2014-09-18 20:43:25 +02:00
jfha73
e5e94e0d2e
Update config.w32
...
Change of php5 for php7
2014-09-18 20:43:24 +02:00
jfha73
51e343d5d7
Update config.m4
...
Change of php5 for php7
2014-09-18 20:43:23 +02:00
jfha73
eed9fdb981
Update apache_config.c
2014-09-18 20:43:21 +02:00