php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
97,296 Commits 547 Branches 1,481 Tags
dc6ea028b5dce01c314afbb2bb628cf44e070b0c
Commit Graph

97296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Zelenka
dc6ea028b5 Fix indent in opnenssl_decrypt tests 2016-07-24 13:40:54 +01:00
Xinchen Hui
e06331931d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #72661 (ReflectionType::__toString crashes with iterable)
 2016-07-24 11:01:34 +08:00
Xinchen Hui
a3a797dbd5 Fixed bug #72661 (ReflectionType::__toString crashes with iterable) 2016-07-24 11:01:19 +08:00
Anatol Belski
59381e2083 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix compiler warning
  rework long path normalization stuf
 2016-07-24 04:03:54 +02:00
Anatol Belski
addb2e22b3 fix compiler warning 2016-07-24 03:51:53 +02:00
Anatol Belski
4acde210fd rework long path normalization stuf 
Simplify, set error codes, ensure 32-bit is ok as well. The
canonicalization part is still an issue on win7 as the API
is missing there. However a partial improvement is reached
there as well thanks to the slash conversion.
 2016-07-24 03:51:47 +02:00
Nikita Popov
8af431a790 Merge branch 'PHP-7.1' 2016-07-24 00:18:57 +02:00
Nikita Popov
ca64223193 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-24 00:18:51 +02:00
Nikita Popov
aecc435482 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-24 00:18:47 +02:00
Nikita Popov
04b42b1e05 More tolerance in another IntlCalendar test 
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
 2016-07-24 00:15:14 +02:00
Nikita Popov
ade99115ca Merge branch 'PHP-7.1' 2016-07-24 00:08:42 +02:00
Nikita Popov
42e995e0d3 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-24 00:08:18 +02:00
Nikita Popov
2194690625 Ensure session GC is not run during variation6.phpt 
The implemented gc() handler simply deletes all sessions, including
the current one. This may cause a subsequent unlink() warning.
Avoid this by preventing GC from running.
 2016-07-24 00:07:54 +02:00
Anatol Belski
05f8d1f8d0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  add folds
  improve typedef and fix the fake function
  add missing cast
 2016-07-23 23:25:22 +02:00
Anatol Belski
69ae61af96 add folds 2016-07-23 23:24:32 +02:00
Anatol Belski
88d4f149a6 improve typedef and fix the fake function 2016-07-23 23:24:32 +02:00
Anatol Belski
40557fdc34 add missing cast 2016-07-23 23:24:32 +02:00
Nikita Popov
307e4bfca1 Merge branch 'PHP-7.1' 2016-07-23 23:14:40 +02:00
Sjon Hortensius
66626cc223 Fix typos, previous version used reserver/reserverd/reserved 2016-07-23 23:14:14 +02:00
Anatol Belski
7964c5c060 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #72625 realpath() fails on non canonical long path
  correct comment
  don't return long path prefix to script
 2016-07-23 21:31:36 +02:00
Anatol Belski
0f16c56262 Fixed bug #72625 realpath() fails on non canonical long path 2016-07-23 21:11:27 +02:00
Anatol Belski
fc30b8e0f7 correct comment 2016-07-23 21:11:27 +02:00
Anatol Belski
7d83324105 don't return long path prefix to script 2016-07-23 21:11:27 +02:00
Anatol Belski
99bc1407c8 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
  fix test
 2016-07-23 21:06:46 +02:00
Anatol Belski
3d95cc50a7 fix test 2016-07-23 21:06:11 +02:00
Anatol Belski
b238211732 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
 2016-07-23 21:04:52 +02:00
Anatol Belski
958fa34c16 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test
 2016-07-23 21:03:45 +02:00
Anatol Belski
80fee637f4 fix test 2016-07-23 20:55:39 +02:00
Christoph M. Becker
cbb4e424e8 Merge branch 'PHP-7.1' 2016-07-23 19:46:19 +02:00
Christoph M. Becker
8aa9ddb4d2 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 19:38:45 +02:00
Christoph M. Becker
2c0a18480d Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 19:36:53 +02:00
Christoph M. Becker
88838dd282 Fix #68712: suspicious if-else statements 2016-07-23 19:29:43 +02:00
Christoph M. Becker
95a87c3f82 Merge branch 'PHP-7.1' 2016-07-23 18:13:59 +02:00
Christoph M. Becker
88bc54d3dc Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 18:13:29 +02:00
Christoph M. Becker
03ccd42b18 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 18:12:14 +02:00
Christoph M. Becker
9fbd0c1ff1 Fix copy&paste errors in gd_interpolation.c 
According to <https://github.com/libgd/libgd/commit/f101380>.
 2016-07-23 18:09:18 +02:00
Christoph M. Becker
e13abc1fd7 Merge branch 'PHP-7.1' 2016-07-23 17:05:30 +02:00
Christoph M. Becker
03eeea4aa5 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 16:57:12 +02:00
Christoph M. Becker
5056d59f96 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 16:55:16 +02:00
Christoph M. Becker
2c16b9cf62 Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c 
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.

[1] <https://github.com/libgd/libgd/commit/aa1d71c>
 2016-07-23 16:48:07 +02:00
Bob Weinand
72d1d416fe Merge branch 'PHP-7.1' 2016-07-23 16:40:29 +02:00
Bob Weinand
35764e3579 Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-07-23 16:40:02 +02:00
Bob Weinand
6046acf93e Fix ClosedGeneratorException possibly thrown into wrong scope 2016-07-23 16:39:21 +02:00
Mark Jones
e63ceacfca Remove unused DEFAULT_KEY_LENGTH define 2016-07-23 16:04:55 +02:00
Nikita Popov
3bfea88ad8 Merge branch 'PHP-7.1' 2016-07-23 13:31:04 +02:00
Nikita Popov
696d6e7c90 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 13:30:55 +02:00
Nikita Popov
f12fd5c2d3 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/standard/ftp_fopen_wrapper.c
 2016-07-23 13:29:57 +02:00
vhuk
65abdb556d Fix for bug #54431 2016-07-23 13:28:42 +02:00
Nikita Popov
50b485d94b Merge branch 'PHP-7.1' 2016-07-23 00:12:39 +02:00
Nikita Popov
f4d1af7981 Fix build 
Missed this occurrence...
 2016-07-23 00:12:11 +02:00