clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,152 Commits 494 Branches 1,367 Tags 800 MiB
0ca57dd1d3
Commit Graph

33839 Commits

Author SHA1 Message Date
Xinchen Hui
5edbe296ef Fixed bug codes in stream_resolve_include_path.... 2014-03-07 18:01:22 +08:00
Dmitry Stogov
fff3c54f9e Added check 2014-03-06 22:07:28 +04:00
Xinchen Hui
10c7f2ddbc Fixed IS_REFERENCE handling in preg_match 2014-03-06 23:39:34 +08:00
Xinchen Hui
2d45dce4aa Second argument of call_user_method is ref 2014-03-06 23:32:47 +08:00
Xinchen Hui
00cf4e5a58 Have no idea why I changed it to 0 in 70ddc853 2014-03-06 23:28:31 +08:00
Xinchen Hui
95d31d773f Fixed refcounted on INTERNED string 2014-03-06 23:18:48 +08:00
Xinchen Hui
e1a29600bc To be consistent with old PHP in is_callable(do we really need it?) 2014-03-06 23:16:06 +08:00
Dmitry Stogov
dfe1fd73bf Fixed uninitialized value 2014-03-06 16:09:00 +04:00
Xinchen Hui
a1052c51f8 Fixed wrong fix for tmpbuf 2014-03-06 19:22:59 +08:00
Xinchen Hui
9e9737061e Fixed IS_REFERENCE handling 2014-03-06 19:07:59 +08:00
Xinchen Hui
3290476a9f Fixed wrong merges 2014-03-06 19:06:05 +08:00
Xinchen Hui
9eb9ba3aa8 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 
Conflicts:
	ext/standard/formatted_print.c
 2014-03-06 19:03:22 +08:00
Xinchen Hui
11166882c0 Fixed memory leak in ext/standard/tests/strings/str_word_count.php 2014-03-06 19:00:51 +08:00
Xinchen Hui
9a81b6dea4 Fixed memory leak in ext/standard/tests/time/strptime_parts.php 2014-03-06 18:51:20 +08:00
Xinchen Hui
bbacddaf90 Fixed memory leak in vfprintf 2014-03-06 18:47:43 +08:00
Dmitry Stogov
08aadb0638 Fixed memory leak 2014-03-06 14:42:16 +04:00
Xinchen Hui
e4f5b9ac38 Fixed memory leak in getimagesize 2014-03-06 18:30:32 +08:00
Xinchen Hui
ddf3861923 Fixed memory leak in vsprintf 2014-03-06 18:06:41 +08:00
Dmitry Stogov
2eb980f614 IS_REFERENCE with refcount==1 should be handled as ordinal value 2014-03-06 12:37:46 +04:00
Dmitry Stogov
47f9014458 Fixed array_nultisort() to support IS_REFERENCE 2014-03-05 17:23:40 +04:00
Dmitry Stogov
da75df6faa Fixed string lengths 2014-03-05 16:04:28 +04:00
Dmitry Stogov
7320abbaa9 Reverted "efree(args);" removed by mistake 2014-03-05 15:49:24 +04:00
Xinchen Hui
70b7887712 Fixed refcounted handling 2014-03-05 18:17:16 +08:00
Xinchen Hui
74c2deecd8 Fixed refcounted 2014-03-05 18:11:22 +08:00
Xinchen Hui
581fa5822e Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 
Conflicts:
	ext/standard/array.c
 2014-03-05 18:02:35 +08:00
Xinchen Hui
bfaa9669a6 Fixed refcounted 2014-03-05 18:00:46 +08:00
Dmitry Stogov
3733737328 Handle interned strings as non-refcounted scalars 2014-03-05 13:55:56 +04:00
Xinchen Hui
0791bdb562 retval might be IS_UNDEF even the call is successed 2014-03-05 17:53:01 +08:00
Xinchen Hui
75d567ef9a Fixed NULL pointer def in ext/standard/tests/array/array_fill_keys_variation2.php 2014-03-05 17:31:10 +08:00
Xinchen Hui
2ee6bc1309 Remove "efree(args") 2014-03-05 17:07:09 +08:00
Xinchen Hui
57ae19a0b7 Checkout refcounted before doing addref 2014-03-05 17:02:50 +08:00
Xinchen Hui
cb5e9eac9f Fixed memory leak (ext/standard/tests/file/stream_002.phpt) 2014-03-05 16:03:05 +08:00
Dmitry Stogov
dd7c7e6fb2 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 
Conflicts:
	ext/standard/formatted_print.c
 2014-03-05 11:26:35 +04:00
Dmitry Stogov
040dea8b82 Arguments taken by internal functions using zend_parse_parameters() with "+" and "*" specifications must not be deallocated anymore. 2014-03-05 11:10:52 +04:00
Xinchen Hui
d5fa6b2467 Fixed name length in get_include_path 2014-03-05 12:16:57 +08:00
Xinchen Hui
37343cc17d Fixed var_export reference handling 2014-03-05 12:10:43 +08:00
Xinchen Hui
53a3210750 Fixed refcount showing 2014-03-05 12:06:56 +08:00
Xinchen Hui
91a1e7b90b Fixed warning mesgs 2014-03-05 12:05:28 +08:00
Xinchen Hui
63a1b34924 Fixed segfault 2014-03-05 11:44:51 +08:00
Xinchen Hui
1c42751316 Refactor stream_get_record to return zend_string 2014-03-05 11:41:21 +08:00
Xinchen Hui
2cdc90bd94 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-03-05 11:30:51 +08:00
Xinchen Hui
1a828f42ea Fixed stream_cast 2014-03-05 11:28:31 +08:00
Dmitry Stogov
19670c2bbc Fixied calling object closures from internal functions 2014-03-05 01:54:21 +04:00
Xinchen Hui
12478f7287 Fixed warning msg 2014-03-04 20:31:24 +08:00
Xinchen Hui
f853449ce8 Fixed memory leak temporary 2014-03-04 20:29:48 +08:00
Xinchen Hui
c1ec21e265 Fixed memory leak 2014-03-04 20:25:26 +08:00
Xinchen Hui
851ba9a198 Fixed warning mesg 2014-03-04 20:10:41 +08:00
Xinchen Hui
bab58ab97e Fixed stream_select (incompeleted) 2014-03-04 19:12:43 +08:00
Xinchen Hui
e3de898d98 Paramter are references 2014-03-03 23:14:57 +08:00
Xinchen Hui
d821c90148 Return empty string 2014-03-03 23:09:31 +08:00
Xinchen Hui
1f228e46d0 Error message has been changed 2014-03-03 22:39:20 +08:00
Dmitry Stogov
27d3b5b5b4 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-03-03 15:40:36 +04:00
Dmitry Stogov
fe8c0b889f Fixed return_value destruction 2014-03-03 15:36:58 +04:00
Xinchen Hui
eb7a9c7c47 Fixed wrong data type (all tests passed in ext/network now) 2014-03-03 18:27:45 +08:00
Xinchen Hui
4e9f2c7c00 Temorary fixed memleak 2014-03-03 18:24:06 +08:00
Xinchen Hui
6374fce5db Wrong type check 2014-03-03 18:23:12 +08:00
Xinchen Hui
dae6e672c2 Fixed reference arguments handling 2014-03-03 18:20:53 +08:00
Xinchen Hui
b4ccb6a9fd Refactor gethostbyname to returing zend_string 2014-03-03 18:19:16 +08:00
Xinchen Hui
93ea0dfe98 Fixed fsockopen's reference argument handling 2014-03-03 18:14:59 +08:00
Xinchen Hui
ebfa9e0415 Fixed NULL pointer def 2014-03-03 18:12:13 +08:00
Xinchen Hui
1aecda4c43 Fixed php_mail log 2014-03-03 18:00:56 +08:00
Xinchen Hui
70ddc853fd Refactor php_escape_shell_* to return zend_string 2014-03-03 17:33:40 +08:00
Xinchen Hui
d50782286f Fixed get_cfg_var 2014-03-03 17:09:06 +08:00
Xinchen Hui
7735226e36 Fixed memory leak in php_uname 2014-03-03 16:56:54 +08:00
Xinchen Hui
ec30d8178d Fixed proc_open's reference argument 2014-03-03 16:50:35 +08:00
Xinchen Hui
3e93cd9fd7 Fixed serval segfaults 2014-03-03 16:46:18 +08:00
Xinchen Hui
07eb0f4970 Fixed NULL pointer def 2014-03-03 16:42:34 +08:00
Xinchen Hui
be4878edd0 Use stack memory here to avoid mem leak 2014-03-03 16:39:29 +08:00
Xinchen Hui
b07d5913dd Refactor php_url_(en|de)code to return zend_string 2014-03-03 16:34:43 +08:00
Xinchen Hui
8ca824d673 Fixed memory leak 2014-03-03 16:13:03 +08:00
Xinchen Hui
0fe209e317 Refactor _php_stream_scandir to avoid memleak 2014-03-02 22:47:59 +08:00
Xinchen Hui
ce03111e50 Fixed segfault in closedir 2014-03-02 22:35:24 +08:00
Xinchen Hui
38b72bd783 Fixed bug55871.phpt in another way, test script should be changed? 2014-03-02 22:28:36 +08:00
Xinchen Hui
0f117ef4d9 Fixed php_implode with reference 2014-03-02 22:14:25 +08:00
Xinchen Hui
92eda10261 Fixed str_replace count handling 2014-03-02 22:07:32 +08:00
Xinchen Hui
6ed82f7104 Use zend_string to avoid memleak 2014-03-02 22:00:30 +08:00
Xinchen Hui
8cb468d5e3 Fixed wrong condition (introduced by previous ci) 2014-03-02 21:48:38 +08:00
Xinchen Hui
18363f42b2 Fixed invalid free 2014-03-02 21:44:17 +08:00
Xinchen Hui
35742a74e2 Fixed zend_string 2014-03-02 21:42:21 +08:00
Xinchen Hui
4eeee08ec8 Fixed getClosureThis() 2014-03-02 21:40:20 +08:00
Xinchen Hui
81271854e8 Fixed test 2014-03-02 21:38:00 +08:00
Xinchen Hui
30c20084d7 Fixed memory leak 2014-03-02 21:36:51 +08:00
Xinchen Hui
069c158c20 Fixed php_info related 2014-03-02 21:31:38 +08:00
Xinchen Hui
26e993a7ae Fixed zend_string 2014-03-02 16:07:44 +08:00
Xinchen Hui
5a9e8a5e26 Not reference anymore 2014-03-02 15:47:08 +08:00
Xinchen Hui
8d2c1f58a1 Fixed refcounting 2014-03-02 15:15:51 +08:00
Xinchen Hui
ff5870a288 Fixed reflection (incompeleted) 2014-03-02 15:14:00 +08:00
Xinchen Hui
05e8f28533 This should be a real problem 2014-03-02 14:35:41 +08:00
Xinchen Hui
171fde5491 Fixed SplPriorityQueue's free_obj 2014-03-01 12:44:33 +08:00
Dmitry Stogov
843423716b Fixed user stream filters 2014-02-28 23:05:22 +04:00
Xinchen Hui
dd3a7e97e0 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-03-01 00:46:11 +08:00
Xinchen Hui
7235048ca1 Fixing spl_autoload functional (one test failed due to get_closure) 2014-03-01 00:44:02 +08:00
Xinchen Hui
7208b9660c Fixed autoload_func_info using zval instead of zval * 2014-02-28 23:05:13 +08:00
Xinchen Hui
237dbd972e Fixed uninilized intern 2014-02-28 22:55:59 +08:00
Xinchen Hui
4340f1a561 Fixed offset_key 2014-02-28 22:52:18 +08:00
Xinchen Hui
0680cdb4ac Fixed refcount handling 2014-02-28 22:47:24 +08:00
Xinchen Hui
2a82660923 Temporary fix zcontext 2014-02-28 22:21:51 +08:00
Dmitry Stogov
4865ec6ff0 Fixed ini_get_all() 2014-02-28 17:47:00 +04:00
Dmitry Stogov
2bf3018169 Fixed array_push() 2014-02-28 15:48:39 +04:00
Xinchen Hui
670ef9decd Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-28 19:08:08 +08:00
Xinchen Hui
990c923ef4 Refactored spl_filesystem_iterator 2014-02-28 19:07:54 +08:00
Dmitry Stogov
045c5fddfa Fixed memory leaks 2014-02-28 13:37:55 +04:00
Xinchen Hui
7dcb14ebcd We need to stash the object_ptr in fci 2014-02-28 17:12:53 +08:00
Xinchen Hui
b353d5abe9 Fixed un-initilized iterator in DirectoyItrator 2014-02-28 16:06:47 +08:00
Xinchen Hui
0def388427 Fixed Z_ADDREF 2014-02-28 15:29:00 +08:00
Xinchen Hui
1265850fef Add zend_iterator_dtor 2014-02-28 15:03:43 +08:00
Xinchen Hui
a5ce7d526e Revert "Move zend_objects_store_put out of zend_object_std_init" 
This reverts commit 8ced4f0ac9.
 2014-02-28 13:59:07 +08:00
Xinchen Hui
8ced4f0ac9 Move zend_objects_store_put out of zend_object_std_init 2014-02-28 12:59:51 +08:00
Xinchen Hui
4318e57604 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-28 11:44:39 +08:00
Dmitry Stogov
3f4759515c Fixed memory leak 2014-02-27 22:21:02 +04:00
Xinchen Hui
cfa93d08f5 Unused element 2014-02-27 22:50:31 +08:00
Xinchen Hui
0817cee164 Fixed object creating (std_init calls store_put now) 2014-02-27 22:47:30 +08:00
Dmitry Stogov
3696e038e5 Various fixes related to read_property(), read_dimension() and iterators refactoring 2014-02-27 16:07:36 +04:00
Dmitry Stogov
4ba590697e Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-27 15:40:51 +04:00
Dmitry Stogov
1c3ba95bb5 Refactored read_property() and read_dimension() handlers 2014-02-27 15:40:13 +04:00
Xinchen Hui
382b0dfdb7 Refactoring zend_iterator (incompleted) 2014-02-27 19:19:02 +08:00
Xinchen Hui
122cc5f495 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-27 16:56:17 +08:00
Dmitry Stogov
495551aa8c Fixed iterators API. zend_iterator_init() has to be used in each get_iterator() callback. 2014-02-26 15:01:08 +04:00
Xinchen Hui
95320f1f46 Fixed memory leak 2014-02-26 16:33:27 +08:00
Xinchen Hui
4b6eb998da Fixed error msg 2014-02-26 16:24:44 +08:00
Xinchen Hui
24540362b0 Re-fixed unserialize 2014-02-26 15:51:53 +08:00
Xinchen Hui
b7052ef16d Revert "Fixed unserialize implementation (it's complicated, this issue took me 4 hours :<, need some review)" 
This reverts commit 80a178015d.
 2014-02-26 13:33:55 +08:00
Xinchen Hui
66b7f6722d Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-26 12:52:43 +08:00
Xinchen Hui
80a178015d Fixed unserialize implementation (it's complicated, this issue took me 4 hours :<, need some review) 2014-02-26 12:51:23 +08:00
Xinchen Hui
c146752812 Fixed reference handling in zif_unserialize 2014-02-26 11:21:52 +08:00
Xinchen Hui
7f527d8047 Fixed reference handling in serialize/unserialize 2014-02-26 11:08:13 +08:00
Dmitry Stogov
4a1ecf0e8b Reflection related fixes 2014-02-26 02:02:57 +04:00
Dmitry Stogov
1ac966d524 Fixed memory leaks 2014-02-25 23:12:25 +04:00
Dmitry Stogov
c077742b2a Fixed reflection object destruction 2014-02-25 17:03:48 +04:00
Dmitry Stogov
fe5c1cc48f Fixed crach because of dereferencing of NULL pointer 2014-02-25 16:25:45 +04:00
Dmitry Stogov
639e4e1afa Changes zend_is_callable() to use zend_string* instead of char* 2014-02-25 16:03:34 +04:00
Xinchen Hui
499b553c18 Fixed NULL pointer dereference 2014-02-25 18:14:22 +08:00
Xinchen Hui
595741f6ec Fixed test fail in ext/standard/tests/serialize/bug64354_1.php 2014-02-25 17:58:01 +08:00
Xinchen Hui
dc2d758c93 Fixed segfaults 2014-02-25 16:54:26 +08:00
Xinchen Hui
71dac3d54f Don't add_ref in add_*_str functions 2014-02-25 15:47:24 +08:00
Xinchen Hui
bfcb3defdd Fixed memory leak in ext/standard/tests/strings/quotemeta_basic.php 2014-02-25 13:08:16 +08:00
Xinchen Hui
f482092cab Fixed momory leak in heberv 2014-02-25 13:04:00 +08:00
Xinchen Hui
2ed1f00869 Refactor php_crypt to returning zend_string 2014-02-25 12:46:51 +08:00
Xinchen Hui
9e4da2d0ec Fixed segfault in ext/standard/tests/strings/money_format_variation1.phpt 2014-02-25 12:36:33 +08:00
Xinchen Hui
1dc69e86f9 Fixed memory leak in setlocale 2014-02-25 12:30:50 +08:00
Xinchen Hui
e0a32353af Fixed NULL pointer dereference in ext/standard/tests/strings/setlocale_basic2.php 2014-02-25 12:09:39 +08:00
Xinchen Hui
93428dc6b9 Refactor base64 to returning zend_string 2014-02-24 18:48:22 +08:00
Xinchen Hui
1e5a4f281d Refactor php_uu(en/de)code to returning zend_string 2014-02-24 18:32:09 +08:00
Xinchen Hui
57a3feb422 Fixed memory leak in strrev 2014-02-24 18:15:40 +08:00
Xinchen Hui
5adeaa147d Refactoring php_stream_copy_to_mem to return zend_string 2014-02-24 18:12:30 +08:00
Xinchen Hui
9e9f6c7123 Fixed memory leak in str_pad 2014-02-24 17:44:42 +08:00
Xinchen Hui
b529155635 Fixed memory leak in nlbr 2014-02-24 17:40:18 +08:00
Xinchen Hui
a9529b8ad3 Refactor chunk_split returning zend_string to avoid memleak 2014-02-24 17:35:47 +08:00
Xinchen Hui
479b82c0d4 Fixed invalid write in vsprintf tests 2014-02-24 17:26:09 +08:00
Xinchen Hui
1bb59c73c4 Fixed NULL pointer dereference in ext/standard/tests/strings/strtr_variation* 2014-02-24 16:36:48 +08:00
Xinchen Hui
4fb57d7f4f Fixed wrong size of key length 2014-02-24 16:24:08 +08:00
Xinchen Hui
6c3c1f0949 Fixed memory leak in ext/standard/tests/strings/bug24098.phpt 2014-02-24 16:14:46 +08:00
Xinchen Hui
4dac68221f Fixed NULL pointer dereference in php_url_encode_hash_ex 2014-02-24 16:07:02 +08:00
Xinchen Hui
94e30a8197 Fixed memory leak in substr_replace 2014-02-24 15:58:38 +08:00
Xinchen Hui
948a00ff59 Now we always ZVAL_DUP args[argnum] now (in ed8691b2) 2014-02-24 15:13:06 +08:00
Xinchen Hui
737a84ed04 Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php" 
This reverts commit b1fb93b482.
 2014-02-24 15:04:05 +08:00
Xinchen Hui
6f6573ef6a Fixed several memory leaks 2014-02-24 15:03:35 +08:00
Xinchen Hui
077b02326a Refactor php_addslashes using zend_string 2014-02-24 12:07:09 +08:00
Xinchen Hui
ed8691b24b Fixed segfault in ext/standard/tests/strings/fprintf_variation_001.php 2014-02-23 22:33:10 +08:00
Xinchen Hui
69a93d2fd7 Fixed segfault in ext/standard/tests/strings/bug49785.phpt 2014-02-23 21:53:48 +08:00
Xinchen Hui
70baf8f419 Fixed the memroy leak first (refactor it later) 2014-02-23 21:43:59 +08:00
Xinchen Hui
b287591a87 Refactor php_str_to_str returning zend_string 2014-02-23 19:25:26 +08:00
Xinchen Hui
bd3bd63571 Fixed wrong zend_string usage in ext/standard/tests/strings/bug47443.php 2014-02-23 19:04:40 +08:00
Xinchen Hui
6a856d4aa9 Fixed inproper IS_REF handling in ext/standard/tests/strings/bug27295.phpt 2014-02-23 18:48:15 +08:00
Xinchen Hui
f21eb59cda Fixed memory leak ext/standard/tests/strings/bug21453.phpt 2014-02-23 18:28:00 +08:00
Xinchen Hui
915a8a2d42 Fixed test ext/standard/tests/strings/bug26817.php 2014-02-23 18:22:53 +08:00
Xinchen Hui
5db2503fc0 Fixed memory leak in ext/standard/tests/strings/bug20927.phpt 2014-02-23 18:17:39 +08:00
Xinchen Hui
c0aba2c641 Refactor basename using zend_string 2014-02-23 18:08:35 +08:00
Xinchen Hui
0e4cfad1e8 Refactor php_addcslashes using zend_string 2014-02-22 20:51:26 +08:00
Xinchen Hui
b1fb93b482 Fixed segfault in ext/standard/tests/strings/bug24208.php 
it still ugly,, maybe we should make EG(active_symbol_table) a zend_array?
 2014-02-22 20:19:12 +08:00
Xinchen Hui
3cf418c50a No refcounted type 2014-02-22 20:05:04 +08:00
Dmitry Stogov
d149228b69 Use better data structures (incomplete) 2014-02-21 23:51:08 +04:00
Dmitry Stogov
6454684212 Use better data structures (incomplete) 2014-02-21 22:59:51 +04:00
Dmitry Stogov
52bd62eca8 Fixed assertions 2014-02-21 20:35:40 +04:00
Xinchen Hui
013cc55395 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 
Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
 2014-02-21 22:41:48 +08:00
Dmitry Stogov
d0eccdeea1 Fixed array_unshift() 2014-02-21 17:38:12 +04:00
Dmitry Stogov
7e03f3712b All zend_parse_parameters("Z") has to be replaced with zend_parse_parameters("z") 2014-02-21 17:22:02 +04:00
Xinchen Hui
8211026fa7 Fixed segfault in ext/standard/tests/strings/add-and-stripslashes.phpt 2014-02-21 16:39:59 +08:00
Xinchen Hui
189a39a187 Fixed segfault 2014-02-19 18:49:00 +08:00
Xinchen Hui
c1c4d26817 Use better data structures (incomplete) 2014-02-19 17:58:39 +08:00
Dmitry Stogov
557994d50d Use better data structures (incomplete) 2014-02-19 01:12:05 +04:00
Dmitry Stogov
246d50fd95 Fixed memory leak 2014-02-18 17:11:57 +04:00
Dmitry Stogov
7428cac6e8 Use better data structures (incomplete) 2014-02-18 16:44:01 +04:00
Dmitry Stogov
9ddf3c5780 Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2 2014-02-18 16:28:26 +04:00
Dmitry Stogov
5de7115679 Use better data structures (incomplete; able to run bench.php) 2014-02-18 16:27:38 +04:00
Xinchen Hui
43b03c74b3 Refacting smart_str 2014-02-18 17:42:46 +08:00
Dmitry Stogov
2b9b9afa7a Use better data structures (incomplete) 2014-02-17 17:59:18 +04:00
Xinchen Hui
ad1838d248 Use better data structures (incomplete) 2014-02-16 22:27:31 +08:00
Xinchen Hui
f0168baecf Use better data structures (incomplete) 2014-02-16 22:15:54 +08:00
Xinchen Hui
34aefa5604 Use better data structures (incomplete) 2014-02-15 23:21:09 +08:00
Xinchen Hui
6cb316cf5d Use better data structures (incomplete) 2014-02-14 23:11:40 +08:00
Dmitry Stogov
c56a2344d0 Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2 2014-02-14 13:40:23 +04:00
Dmitry Stogov
398256e5fe Use better data structures (incomplete) 2014-02-14 13:40:11 +04:00
Xinchen Hui
068ec75f8b Use better data structures (incomplete) 2014-02-14 17:05:04 +08:00
Dmitry Stogov
40e053e7f3 Use better data structures (incomplete) 2014-02-13 17:54:23 +04:00
Dmitry Stogov
6306918ed2 Use better data structures (incomplete) 2014-02-12 23:54:04 +04:00
Dmitry Stogov
7a9348f45d Reverted zval_clear() and zval_release() back to zval_ptr_dtor() 2014-02-12 22:51:19 +04:00
Xinchen Hui
d3954f16d3 Use better data structures (incomplete) -- stash for today work 2014-02-12 22:15:08 +08:00
Dmitry Stogov
4e66abad54 Use better data structures (incomplete) - refactored return_value handling 2014-02-12 14:29:51 +04:00
Xinchen Hui
0c0efba45f Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-11 19:33:48 +08:00
Xinchen Hui
3f4c877bf7 Use better data structures (incomplete) 2014-02-11 19:33:18 +08:00
Dmitry Stogov
2161103fc3 Use better data structures (incomplete) 2014-02-10 17:49:21 +04:00
Dmitry Stogov
00244baba8 Use better data structures (incomplete) 2014-02-10 12:18:01 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Remi Collet
5b5b9b9239 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
 2014-01-20 09:39:39 +01:00
Remi Collet
0401226d93 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
 2014-01-20 09:39:29 +01:00
Remi Collet
e3192473b5 Skip readline tests which fail with libedit 
Add specific libedit test (output slightly differs)
 2014-01-20 09:38:34 +01:00
Remi Collet
3b82a477b0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
 2014-01-20 08:41:04 +01:00
Remi Collet
91513097ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
 2014-01-20 08:40:39 +01:00
Remi Collet
31d67bd353 Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714 
Checking all libedit functions, this check is done in each functions (add_history,
read_history, write_history, ...) but is missing in clear_history.

Test coverage: readline_clear_history_001.phpt
 2014-01-20 08:38:53 +01:00
Yasuo Ohgaki
fd45f1eb78 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:33:27 +09:00
Yasuo Ohgaki
fb7e25d2e0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:32:35 +09:00
Yasuo Ohgaki
4e55c6bffb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:31:50 +09:00
Yasuo Ohgaki
e769c96a11 Enable zend.multibyte tests. Tipcal configuration works, but most tests fail. 2014-01-19 13:29:45 +09:00
Will Fitch
9eb4bc2f84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:49:06 -05:00
Will Fitch
fb2091b1d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:41:45 -05:00
Will Fitch
98907a96f9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:40:54 -05:00
Will Fitch
da83b513b2 Fix #62479: Some chars not parsed in passwords 
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
 2014-01-18 19:27:40 -05:00
Will Fitch
4e5195f82c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66509: copy() arginfo incorrect since 5.4
 2014-01-18 11:57:34 -05:00
Will Fitch
a540c57331 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66509: copy() arginfo incorrect since 5.4
 2014-01-18 11:56:22 -05:00
Will Fitch
767e6d2e08 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66509: copy() arginfo incorrect since 5.4

Conflicts:
	NEWS
 2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb Fix bug #66509: copy() arginfo incorrect since 5.4 
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
 2014-01-18 11:25:53 -05:00
Anatol Belski
deb56c010e Merge branch 'PHP-5.6' 2014-01-17 11:08:21 +01:00
Anatol Belski
b58dbefba0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added appropriate exception handling flag to ext\intl
  Update NEWS
 2014-01-17 11:08:02 +01:00
Anatol Belski
7f0aff52cf added appropriate exception handling flag to ext\intl 
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
 2014-01-17 11:03:40 +01:00
Anatol Belski
feb4eb850d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked the test for bug #66481
 2014-01-17 03:32:26 +01:00
Anatol Belski
8b703e9ee0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked the test for bug #66481
 2014-01-17 03:32:06 +01:00
Anatol Belski
14e371e7d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  forked the test for bug #66481
 2014-01-17 03:31:38 +01:00
Anatol Belski
a218a8b917 forked the test for bug #66481 2014-01-17 03:30:42 +01:00
Xinchen Hui
7691926bbe Merge branch 'PHP-5.6' 2014-01-16 14:42:14 +08:00
Xinchen Hui
bfcdd67865 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-16 14:42:04 +08:00
Xinchen Hui
9799816e0c Merge branch 'PHP-5.4' into PHP-5.5 2014-01-16 14:41:52 +08:00
Xinchen Hui
b777248ded Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null) 2014-01-16 14:41:12 +08:00
Xinchen Hui
271053ad47 Revert "Bug #66481 Segfaults on session_name()" 
This reverts commit 5662ffb295.
 2014-01-16 14:38:35 +08:00
Yasuo Ohgaki
7b5b2b4efa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:35:57 +09:00
Yasuo Ohgaki
518327f7e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:35:11 +09:00
Yasuo Ohgaki
744f38c2d6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #66481 Segfaults on session_name()
 2014-01-16 11:34:31 +09:00
Conor McDermottroe
5662ffb295 Bug #66481 Segfaults on session_name() 
If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.

This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().
 2014-01-16 11:33:10 +09:00
Dmitry Stogov
511a375e60 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Log information about cached scripts and keys
 2014-01-15 12:15:41 +04:00
Dmitry Stogov
299d893f0a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Log information about cached scripts and keys
 2014-01-15 12:15:25 +04:00
Dmitry Stogov
7359dd6df3 Log information about cached scripts and keys 2014-01-15 12:12:22 +04:00
Dmitry Stogov
61028ad45e Merge branch 'PHP-5.6' 
* PHP-5.6:
  We don't know PHP_5_6_X_API_NO yet
 2014-01-15 11:11:01 +04:00
Dmitry Stogov
77bc5b8bae We don't know PHP_5_6_X_API_NO yet 2014-01-15 11:09:38 +04:00
Yasuo Ohgaki
e4f1eee6c3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
 2014-01-15 14:39:56 +09:00
Yasuo Ohgaki
28be6aea9c Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up 2014-01-15 14:37:24 +09:00
Yasuo Ohgaki
a92c5b14cf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
 2014-01-15 14:28:08 +09:00
Yasuo Ohgaki
c58329fccc Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element. 2014-01-15 14:27:33 +09:00
Yasuo Ohgaki
ee4e5ce2cf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed pg_version() crash with older postgresql
 2014-01-15 13:32:43 +09:00
Yasuo Ohgaki
d0924c2500 Fixed pg_version() crash with older postgresql 2014-01-15 13:32:15 +09:00
Yasuo Ohgaki
42c134df4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
 2014-01-15 11:07:51 +09:00
Yasuo Ohgaki
167eaedcbd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
 2014-01-15 11:07:10 +09:00
Yasuo Ohgaki
f52c251f60 Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1 2014-01-15 11:06:06 +09:00
Xinchen Hui
aca07343ce Merge branch 'PHP-5.6' 2014-01-14 22:34:53 +08:00
Nikita Popov
a5ee337156 Fixed arguments unpacking segfault with opcache 2014-01-14 22:34:08 +08:00
Anatol Belski
25e57e702b fix uninitialized value 2014-01-14 09:47:27 +01:00
Yasuo Ohgaki
681e1a5ce0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Made pg_version() return full connection info.
 2014-01-14 10:16:43 +09:00
Yasuo Ohgaki
58dff7cee5 Made pg_version() return full connection info. 2014-01-14 10:10:48 +09:00
Paul Tarjan
d599d36d49 Dont ignore errors from FT_Get_Glyph 2014-01-13 16:30:48 -08:00
Andrey Hristov
bbc37e78e8 Merge branch 'master' of git.php.net:php-src 2014-01-14 01:32:36 +02:00
Andrey Hristov
73008bb5ce More refactoring of the big function generating execute requests 2014-01-14 01:31:16 +02:00
Dmitry Stogov
5980e987d2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ZTS build
 2014-01-13 23:11:36 +04:00
Dmitry Stogov
029d019dac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ZTS build
 2014-01-13 23:10:35 +04:00
Dmitry Stogov
9c32d30020 Fixed ZTS build 2014-01-13 23:09:59 +04:00
Anatol Belski
de137e5a8d Merge branch 'PHP-5.6' 
* PHP-5.6:
  forked test for win32
 2014-01-13 17:13:11 +01:00
Anatol Belski
9b2dc009b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  forked test for win32
 2014-01-13 17:12:53 +01:00
Anatol Belski
8092de3ca3 forked test for win32 2014-01-13 17:12:14 +01:00
Dmitry Stogov
127eb33b84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
 2014-01-13 18:07:26 +04:00
Dmitry Stogov
7864fcaec9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
 2014-01-13 18:06:49 +04:00
Dmitry Stogov
ce2f024e9f Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0) 2014-01-13 18:05:21 +04:00
Dmitry Stogov
e141592da6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
 2014-01-13 16:16:57 +04:00
Dmitry Stogov
9b74dc4a07 Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls) 2014-01-13 16:16:23 +04:00
Dmitry Stogov
f5182741a6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  move common code into a function
 2014-01-13 15:36:37 +04:00
Dmitry Stogov
3458dac342 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
 2014-01-13 15:36:06 +04:00
Dmitry Stogov
ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +04:00
Andrey Hristov
cf9966671c Merge branch 'master' of git.php.net:php-src 2014-01-13 12:40:59 +02:00
Andrey Hristov
01d5e28057 move common code into a function 2014-01-13 12:40:39 +02:00
Dmitry Stogov
aab2e8eb7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
 2014-01-13 12:08:23 +04:00
Dmitry Stogov
d09d64c15c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
 2014-01-13 12:07:50 +04:00
Dmitry Stogov
fcd75690fe Fixed bug #66474 (Optimizer bug in constant string to boolean conversion) 2014-01-13 12:06:19 +04:00
Johannes Schlüter
82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter
45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Anatol Belski
9aaea81cfe Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed EOL in the test
 2014-01-09 15:29:16 +01:00
Anatol Belski
ec89e6bfe2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed EOL in the test
 2014-01-09 15:28:47 +01:00
Anatol Belski
4f115c0b7d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed EOL in the test
 2014-01-09 15:28:09 +01:00
Anatol Belski
b8774519e2 fixed EOL in the test 2014-01-09 15:27:26 +01:00
Anatol Belski
3572a0482d Merge branch 'PHP-5.6' 
* PHP-5.6:
  added testcase from bug #65371
 2014-01-09 15:25:18 +01:00
Anatol Belski
4fe9a5d611 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added testcase from bug #65371
 2014-01-09 15:24:55 +01:00
Anatol Belski
418602adfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added testcase from bug #65371
 2014-01-09 15:24:31 +01:00
Anatol Belski
e927dbd1f6 added testcase from bug #65371 2014-01-09 15:23:49 +01:00
Dmitry Stogov
83b00bbd08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:50:12 +04:00
Dmitry Stogov
f16a4bc203 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
 2014-01-09 13:49:54 +04:00
Dmitry Stogov
b5fbde9c5b Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry) 2014-01-09 13:48:08 +04:00
Scott MacVicar
6fe34014f0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:06:33 +00:00
Scott MacVicar
28beaaad9c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:05:34 +00:00
Scott MacVicar
42f084c692 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  [libxml] Unit test for libxml_disable_entity_loader()
 2014-01-06 17:05:16 +00:00
Scott MacVicar
24cc7c0be2 [libxml] Unit test for libxml_disable_entity_loader() 
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
 2014-01-06 17:04:54 +00:00
Anatol Belski
e797e058c5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  one more extension for the basename test
 2014-01-05 19:22:11 +01:00
Anatol Belski
61e1f79585 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  one more extension for the basename test
 2014-01-05 19:21:49 +01:00
Anatol Belski
748e707bf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  one more extension for the basename test
 2014-01-05 19:21:27 +01:00