clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,653 Commits 494 Branches 1,367 Tags 813 MiB
7032e1b96d
Commit Graph

35231 Commits

Author SHA1 Message Date
Xinchen Hui
7032e1b96d Fixed warning message 2014-06-18 16:59:56 +08:00
Xinchen Hui
d5c6816e86 Fixed memory leak while doing fetch 2014-06-18 16:10:51 +08:00
Xinchen Hui
98afbc7f75 Fixed segfaults 2014-06-18 15:43:15 +08:00
Xinchen Hui
ac1d6abbef copy_data seems useless now 2014-06-18 15:13:43 +08:00
Xinchen Hui
83d450c78d Fixed segfault of stream handling 2014-06-18 15:03:01 +08:00
Xinchen Hui
4c4dc8e239 Fixed plugin fetching 2014-06-18 14:26:17 +08:00
Xinchen Hui
2bd14a07fe Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-06-18 12:09:51 +08:00
Xinchen Hui
6288bb8ffe Refactoring mysqlnd (incompleted, only mysqlnd ext compilable) 2014-06-18 12:09:37 +08:00
Dmitry Stogov
e1b18e59f7 Use arena allocator for zend_class_entry, zend_op_array and zend_property_info that live till the end of request 2014-06-18 02:47:01 +04:00
Dmitry Stogov
56731f68a7 Fixed HASH_FLAG_APPLY_PROTECTION flag usage 2014-06-17 13:53:23 +04:00
Dmitry Stogov
accaaf9d6e Don't include trailing zero into hash function 2014-06-17 02:59:00 +04:00
Dmitry Stogov
909acec231 Avoid useles constants update 2014-06-16 23:32:58 +04:00
Dmitry Stogov
50cbd7f4ce Optimize out useles paths 2014-06-16 21:49:46 +04:00
Xinchen Hui
17b98b6379 Refactoring imap (in progress) 2014-06-16 14:59:03 +08:00
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04:00
Dmitry Stogov
edb064e2ee Fixed call to mysqli_init() from an object. (We should find some better fix) 2014-06-12 00:57:10 +04:00
Sara Golemon
b34d7849ed Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix potential segfault in dns_get_record()
 2014-06-11 13:53:59 -07:00
Sara Golemon
e2ef56f760 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix potential segfault in dns_get_record()
 2014-06-11 13:51:53 -07:00
Sara Golemon
4f73394fdd Fix potential segfault in dns_get_record() 
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
 2014-06-11 13:37:04 -07:00
Dmitry Stogov
bccd4184a5 Fixed error messages 2014-06-12 00:33:43 +04:00
Ferenc Kovacs
ec974c4397 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Add optional second arg to unserialize()"
 2014-06-11 14:59:39 +02:00
Ferenc Kovacs
c38ab260fe Revert "Add optional second arg to unserialize()" 
This reverts commit cfd1045822.
 2014-06-11 14:43:09 +02:00
Dmitry Stogov
14e6ee7f42 Use absolute addresses as branch targets for NEW, FE_RESET and FE_FETCH 2014-06-11 11:39:42 +04:00
Stanislav Malyshev
6c81b14b2d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
 2014-06-10 23:21:17 -07:00
Stanislav Malyshev
2ed66ed21c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
 2014-06-10 23:20:07 -07:00
Stanislav Malyshev
f11bba4929 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next

Conflicts:
	configure.in
	main/php_version.h
 2014-06-10 23:19:21 -07:00
Stanislav Malyshev
317bcb96d0 Fix bug #66127 (Segmentation fault with ArrayObject unset) 2014-06-10 23:17:30 -07:00
Stanislav Malyshev
ac6c86b7dc fix test 2014-06-10 14:25:49 -07:00
Remi Collet
0b6676ef87 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:36:38 +02:00
Remi Collet
0a7e131128 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:36:02 +02:00
Remi Collet
12a62ce868 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
 2014-06-10 14:35:23 +02:00
Remi Collet
25b1dc917a Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec 
Upstream:
93e063ee37

Adapted for C standard.
 2014-06-10 14:33:37 +02:00
Remi Collet
ed28d84b9a Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
 2014-06-10 14:24:28 +02:00
Remi Collet
9ee147e6ff Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
 2014-06-10 14:24:07 +02:00
Remi Collet
ff66c90af0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
 2014-06-10 14:23:37 +02:00
Remi Collet
40ef6e07e0 Bug #67412 fileinfo: cdf_count_chain insufficient boundary check 
Upstream:
40bade80cb
 2014-06-10 14:22:04 +02:00
Remi Collet
59383273eb Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
 2014-06-10 14:17:06 +02:00
Remi Collet
1d6286c049 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
 2014-06-10 14:16:39 +02:00
Remi Collet
f6fee381be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
 2014-06-10 14:16:07 +02:00
Remi Collet
5c9f967999 Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check 
Upstream:
36fadd2984
 2014-06-10 14:13:14 +02:00
Remi Collet
8cd184f14a Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
 2014-06-10 14:05:44 +02:00
Remi Collet
5e7cb43890 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
 2014-06-10 14:05:02 +02:00
Remi Collet
18ff81eb1a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
 2014-06-10 14:04:36 +02:00
Remi Collet
e77659a8c8 Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size 
Upstream
27a14bc7ba
 2014-06-10 14:02:36 +02:00
Dmitry Stogov
15ba03fc80 Avoid repeatable zend_is_autogolobal() calls 2014-06-10 00:16:18 +04:00
Dmitry Stogov
7c045c61f0 Optimized for fast path 2014-06-10 00:15:44 +04:00
Dmitry Stogov
9a9bb8877e Improved ZTS support 2014-06-09 21:29:20 +04:00
Dmitry Stogov
dbaef7c038 Avoid unnecessary memory allocation/deallocations and pcre calls 2014-06-09 15:42:32 +04:00
Stanislav Malyshev
b060880c87 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:44 -07:00
Stanislav Malyshev
336b5f59b6 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:04 -07:00