clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,174 Commits 491 Branches 1,363 Tags 838 MiB
4c83582c74
Commit Graph

93174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
4c83582c74 MNDR 
- enum_mysqlnd_protocol_type -> enum_mysqlnd_session_protocol_type
 2015-11-12 16:19:16 +01:00
Andrey Hristov
3091a01799 MNDR 
- mysqlnd_option -> mysqlnd_client_option
 2015-11-12 16:19:16 +01:00
Andrey Hristov
6051a47776 MNDR 
- Rename simple_command* to send_command
 2015-11-12 16:19:16 +01:00
Andrey Hristov
0f38d479e1 MNDR : 
- Rename MYSQLND_OPTIONS to MYSQLND_SESSION_OPTIONS
- Rename MYSQLND_NET_OPTIONS to MYSQLND_IO_OPTIONS
 2015-11-12 16:19:16 +01:00
Dmitry Stogov
998204ef2d Separate common part of compile_file() and compile_string() into zend_compile() 2015-11-12 16:59:44 +03:00
Anatol Belski
fd598ed2c2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fixed typo
 2015-11-12 13:38:43 +01:00
Anatol Belski
cc10da474d fixed typo 2015-11-12 13:37:45 +01:00
Dmitry Stogov
7cae94d751 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  add test for bug #70898
  Also protects this one
  Update NEWS
  Re-fixed #70895
  Revert "Fixed bug Bug #70895 null ptr deref and segfault"
  Revert "refix bug #70895"
  Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"
  Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))
  Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
  update NEWS
  refix bug #70895
  Fixed bug Bug #70895 null ptr deref and segfault
 2015-11-12 13:52:52 +03:00
Anatol Belski
9b0775dfbd Merge branch 'PHP-7.0' 
* PHP-7.0:
  add test for bug #70898
 2015-11-12 09:47:43 +01:00
Anatol Belski
9c4fd36783 add test for bug #70898 2015-11-12 09:28:10 +01:00
Xinchen Hui
aaa4d38a7c Merge branch 'PHP-7.0' 2015-11-12 14:51:39 +08:00
Xinchen Hui
c2de445f79 Also protects this one 2015-11-12 14:51:19 +08:00
Xinchen Hui
f07c869593 Merge branch 'PHP-7.0' 
Conflicts:
	NEWS
 2015-11-12 14:39:20 +08:00
Xinchen Hui
2b494ecc9c Update NEWS 2015-11-12 14:38:44 +08:00
Xinchen Hui
53c03115cf Re-fixed #70895 2015-11-12 14:35:34 +08:00
Xinchen Hui
2bed2152e6 Revert "Fixed bug Bug #70895 null ptr deref and segfault" 
This reverts commit 8eef11d317.
 2015-11-12 14:34:00 +08:00
Xinchen Hui
c245fd7d91 Revert "refix bug #70895" 
This reverts commit 93240102e0.
 2015-11-12 14:33:14 +08:00
Xinchen Hui
75f85288f4 Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))" 
This reverts commit e4e54f33ce.
 2015-11-12 14:32:35 +08:00
Xinchen Hui
29674a2e27 Merge branch 'PHP-7.0' 2015-11-12 14:20:24 +08:00
Xinchen Hui
fc611a134b Merge branch 'PHP-5.6' into PHP-7.0 2015-11-12 14:20:03 +08:00
Xinchen Hui
1e06bf9c2c Merge branch 'PHP-7.0' 2015-11-12 14:19:11 +08:00
Xinchen Hui
e4e54f33ce Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291)) 
Include tail \0
 2015-11-12 14:18:02 +08:00
Côme Bernigaud
391087ed28 Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11) 
Note that passing 0 will also result in default port.
 2015-11-12 07:06:05 +01:00
Anatol Belski
a4e16cd823 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  refix bug #70895
  Fixed bug Bug #70895 null ptr deref and segfault
 2015-11-12 01:43:38 +01:00
Anatol Belski
a1e8b74827 update NEWS 2015-11-12 01:41:59 +01:00
Anatol Belski
93240102e0 refix bug #70895 
move this code to where it belongs, no behavior change to actual
throwing function, thus retaining compat with old ZPP
 2015-11-12 01:39:02 +01:00
Anatol Belski
8eef11d317 Fixed bug Bug #70895 null ptr deref and segfault 2015-11-12 00:52:36 +01:00
Dmitry Stogov
63c4414940 Initialize ctx->optimization_level 2015-11-12 02:46:41 +03:00
Dmitry Stogov
09aa68b294 Break dependency between opcache and optimizer. Remove copatibility macros. 2015-11-12 02:02:24 +03:00
Anatol Belski
d1077f7a89 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix format macro names in UPGRADING.INTERNALS
 2015-11-11 16:35:07 +01:00
Anatol Belski
a2e59e72bc fix format macro names in UPGRADING.INTERNALS 2015-11-11 16:33:34 +01:00
Ferenc Kovacs
e88e3f218d Merge branch 'PHP-7.0' 
* PHP-7.0:
  Ensure the test fails
 2015-11-11 14:59:54 +01:00
Ferenc Kovacs
2777d0a1d9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Ensure the test fails
 2015-11-11 14:59:31 +01:00
Xinchen Hui
f72c7edfa4 Ensure the test fails 2015-11-11 14:55:33 +01:00
Xinchen Hui
9567726978 Merge branch 'PHP-7.0' 2015-11-11 19:51:57 +08:00
Xinchen Hui
88fb6d90c4 Ensure the test fails 2015-11-11 19:51:33 +08:00
Anatol Belski
0b89c29288 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS, patch for #70249 pulled into RC7
  adjust test expectation
  fix test filename and title
 2015-11-11 12:21:51 +01:00
Anatol Belski
3517f85e47 update NEWS, patch for #70249 pulled into RC7 2015-11-11 12:20:18 +01:00
Anatol Belski
b89f451694 adjust test expectation 2015-11-11 09:47:29 +01:00
Anatol Belski
3cdc438e53 fix test filename and title 2015-11-11 09:47:24 +01:00
Ferenc Kovacs
3977f1fa7d Merge branch 'PHP-7.0' 
* PHP-7.0:
  propare for 5.6.16RC1
 2015-11-11 09:22:10 +01:00
Ferenc Kovacs
1f39665083 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  propare for 5.6.16RC1
 2015-11-11 09:21:32 +01:00
Ferenc Kovacs
b22636c838 propare for 5.6.16RC1 2015-11-11 09:20:16 +01:00
Dmitry Stogov
948b7f5421 Changed ZEND_FREE.op2.num and ZEND_FE_FREE.op2.num back to use live_range_offset (try_catch_offset does't work) 2015-11-11 11:12:44 +03:00
Xinchen Hui
cd6dda1679 Merge branch 'PHP-7.0' 2015-11-11 12:33:13 +08:00
Xinchen Hui
82f503f587 Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev) 
Let's fixed this in the root instead
 2015-11-11 12:32:46 +08:00
Xinchen Hui
c3260b66c9 Revert "Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)" 
This reverts commit d6c527830e.
 2015-11-11 12:06:38 +08:00
Xinchen Hui
607e17e269 Merge branch 'PHP-7.0' 2015-11-11 11:35:09 +08:00
Xinchen Hui
d6c527830e Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev) 
Maybe we should introduce a new zend_hash_safe_apply which always reload
the ht->arData to make sure won't segfault the ht is grew?
 2015-11-11 11:34:11 +08:00
Dmitry Stogov
baf97b1fcc We don't nees zend_op_array->brk_cont_array at run-time anymore. 
Move zend_op_array->brk_cont_array into CG(context).brk_cont_array.
Use more compact zend_op_array->live_range instead of zend_op_array->brk_cont_array.
Semantic is kept unchanged.
 2015-11-10 21:48:03 +03:00