clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 00:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,635 Commits 494 Branches 1,367 Tags 814 MiB
17b98b6379
Commit Graph

81635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
a1b0ae4247 Fixed startup segfault in non-debug builds 
Fixes issue #87
 2014-06-03 21:24:55 +00:00
Bob Weinand
241211975e PHP 5.4/5.5 compability in phpdbg_watch.c 2014-06-03 21:24:45 +00:00
Nuno Lopes
bf50218983 fix gcov data with some locales (again) 2014-06-03 17:22:16 -04:00
Nuno Lopes
2766926e29 fix gcov data with some locales (again) 2014-06-03 17:21:45 -04:00
Nuno Lopes
082f79de55 fix gcov data with some locales (again) 2014-06-03 17:21:20 -04:00
Bob Weinand
13421c55ff Update NEWS 2014-06-03 21:18:24 +00:00
Bob Weinand
466cd2aa7d Merge sapi/phpdbg into PHP-5.6 2014-06-03 21:15:02 +00:00
Bob Weinand
467b19a948 Fixed startup segfault in non-debug builds 
Fixes issue #87
 2014-06-03 21:03:42 +00:00
Anatol Belski
94d1014dc7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed regression introduced by patch for bug #67072
 2014-06-03 20:52:30 +02:00
Anatol Belski
b416537917 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed regression introduced by patch for bug #67072
 2014-06-03 20:51:51 +02:00
Anatol Belski
e2710310a0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed regression introduced by patch for bug #67072
 2014-06-03 20:51:18 +02:00
Anatol Belski
20568e5028 Fixed regression introduced by patch for bug #67072 
This applies to 5.4 and 5.5 only as a legacy fix.
 2014-06-03 20:43:58 +02:00
Anatol Belski
2cdcf3e877 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
 2014-06-03 11:38:19 +02:00
Anatol Belski
f3f22ff5c6 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files 2014-06-03 11:37:20 +02:00
Remi Collet
ec19c906bb Merge branch 'PHP-5.6' 
* PHP-5.6:
  (re)add cve number in NEWS, from 5.4.29
 2014-06-03 11:28:54 +02:00
Remi Collet
9e16493e72 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  (re)add cve number in NEWS, from 5.4.29
 2014-06-03 11:28:43 +02:00
Remi Collet
97b86c3c4a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  (re)add cve number in NEWS, from 5.4.29
 2014-06-03 11:28:21 +02:00
Remi Collet
0817a2c767 (re)add cve number in NEWS, from 5.4.29 2014-06-03 11:28:07 +02:00
Dmitry Stogov
3f6f0d5a70 Simplified and optimized ZEND_HANDLE_NUMERIC() 2014-06-03 13:10:42 +04:00
Remi Collet
7a00e8890b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:10:08 +02:00
Remi Collet
0e25448e6b NEWS 2014-06-03 11:09:52 +02:00
Remi Collet
e61f7727d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:29 +02:00
Remi Collet
f5333418d7 NEWS 2014-06-03 11:09:18 +02:00
Remi Collet
2d59b87527 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:04 +02:00
Remi Collet
21986f98db NEWS 2014-06-03 11:08:46 +02:00
Remi Collet
4fcb9a9d1b Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check 
Upstream fix 6d209c1c48.patch
Only revelant part applied
 2014-06-03 11:05:00 +02:00
Ferenc Kovacs
3fba1d308c Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS block for 5.6.0RC1
 2014-06-03 10:28:23 +02:00
Ferenc Kovacs
6538dab85f add NEWS block for 5.6.0RC1 2014-06-03 10:27:42 +02:00
Dmitry Stogov
bc2ba841f9 Optimized conditions order 2014-06-03 09:45:09 +04:00
Dmitry Stogov
30c05577f7 Optimized conditions order 2014-06-03 03:54:03 +04:00
Dmitry Stogov
af78ea1d97 Avoid copying of immutable arrays 2014-06-03 02:43:53 +04:00
Dmitry Stogov
2bc1abe204 cleanup 2014-06-03 02:43:31 +04:00
Dmitry Stogov
0427ae08fb cleanup 2014-06-03 00:36:31 +04:00
Xinchen Hui
717b5661e7 Fixed merge 2014-06-01 23:14:31 +08:00
Xinchen Hui
91b2ddc816 Merge branch 'master' into phpng 
Conflicts:
	ext/spl/spl_array.c
	ext/spl/spl_directory.c
	ext/standard/formatted_print.c
 2014-06-01 22:43:06 +08:00
Xinchen Hui
d196ac6a48 Merge branch 'PHP-5.6' 2014-06-01 19:42:53 +08:00
Xinchen Hui
f41ab36e5c Update NEWs 2014-06-01 19:42:39 +08:00
Xinchen Hui
c4e7c7d50e Merge branch 'PHP-5.5' into PHP-5.6 2014-06-01 19:42:20 +08:00
Xinchen Hui
0218e4eb19 Update NEWs 2014-06-01 19:42:01 +08:00
Xinchen Hui
9bb5867fad Merge branch 'PHP-5.4' into PHP-5.5 2014-06-01 19:41:35 +08:00
Xinchen Hui
38be99b739 Fixed bug #67359 (Segfault in recursiveDirectoryIterator) 2014-06-01 19:41:01 +08:00
Dmitry Stogov
032bdbba73 Improved conditions order 2014-05-30 14:40:19 +04:00
Dmitry Stogov
d2020cd91b Merge branch 'phpng' of git.php.net:php-src into phpng 
* 'phpng' of git.php.net:php-src:
  typo
  Revert "Fix ArrayObject with immutable array"
  Fix ArrayObject with immutable array
 2014-05-30 11:13:19 +04:00
Dmitry Stogov
984c8f87d2 Avoid useless duplication of immutable arrays 2014-05-30 11:12:24 +04:00
Dmitry Stogov
45d7ab1a4c Avoid in-place modification 2014-05-30 11:12:03 +04:00
Xinchen Hui
9f70b2f6fa typo 2014-05-30 14:56:50 +08:00
Nikita Popov
92c9f826c9 Revert "Fix ArrayObject with immutable array" 
This reverts commit 9c85aa0489.
 2014-05-29 21:49:54 +02:00
Nikita Popov
9c85aa0489 Fix ArrayObject with immutable array 2014-05-29 21:19:49 +02:00
Adam Harvey
f4a235c541 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:57:54 +00:00
Adam Harvey
b8042acdde Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:56:32 +00:00