clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,653 Commits 494 Branches 1,367 Tags 881 MiB
9a4c9348b1
Commit Graph

94653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
9a4c9348b1 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
  Make phpize use PHP_PREFIX as the default location (windows)
  Enable 'nmake test' on building extensions
 2016-07-25 10:17:41 +02:00
Anatol Belski
0c34d515f1 update NEWS 2016-07-25 10:14:18 +02:00
y-uti
3f842655db Make phpize use PHP_PREFIX as the default location (windows) 
The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.
 2016-07-25 10:01:34 +02:00
y-uti
72ac8cf5ad Enable 'nmake test' on building extensions 
On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.
 2016-07-25 09:55:07 +02:00
Anatol Belski
27dd8048b7 update NEWS 2016-07-25 09:51:13 +02:00
y-uti
0f9bf85ad9 Enable 'nmake test' on building extensions 
On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.
 2016-07-25 09:46:06 +02:00
y-uti
6ed7136371 Make phpize use PHP_PREFIX as the default location (windows) 
The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.
 2016-07-25 09:46:00 +02:00
Christoph M. Becker
138fea83fe Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt
 2016-07-25 02:02:54 +02:00
Christoph M. Becker
305bddb0ed Fix broken test case 
d28f1da introduced a test regression, due to potentially additional output
regarding FreeType support. We fix that by making the test more resilient.
 2016-07-25 02:00:37 +02:00
Christoph M. Becker
4db4997ac5 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt
 2016-07-25 00:16:21 +02:00
Christoph M. Becker
d28f1dae9d Fix broken test case 
The test claims that it would be "checking all the values in returned array",
but due to the use of %a it actually skipped elements. We fix that by using
%s instead.
 2016-07-25 00:13:44 +02:00
Xinchen Hui
ad96a052d9 Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd) 2016-07-24 23:58:22 +08:00
Anatol Belski
da3995852e regenerate date parser with re2c 0.15.3 2016-07-24 14:53:53 +02:00
Anatol Belski
8eb94b6e32 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  regenerate date parser with re2c 0.15.3
 2016-07-24 14:51:59 +02:00
Anatol Belski
9cd23ff84f regenerate date parser with re2c 0.15.3 2016-07-24 14:50:10 +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
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
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
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
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
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
6046acf93e Fix ClosedGeneratorException possibly thrown into wrong scope 2016-07-23 16:39:21 +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
7d77289717 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-22 17:22:13 +02:00
Nikita Popov
4fc1bfa93b Make IntlCalendar::getNow() test more tolerant 
Due to the *1000 factor the two values may be off-by-1000 even
without any actual delay, so increase the check to 2000.
 2016-07-22 17:20:56 +02:00
Xinchen Hui
6929121423 Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements) 2016-07-22 23:15:15 +08:00
Christoph M. Becker
9a2207c90a Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/spl/spl_directory.c
 2016-07-22 15:27:55 +02:00
Christoph M. Becker
6b116932b2 Fix #72646: SplFileObject::getCsvControl does not return the escape character 
This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
 2016-07-22 15:24:50 +02:00
Remi Collet
9622f973a5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  FPM: add test for CVE-2016-5385
 2016-07-22 09:36:36 +02:00
Remi Collet
fb4a6dc0f1 FPM: add test for CVE-2016-5385 2016-07-22 09:35:09 +02:00
Christoph M. Becker
4472f9e822 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 18:39:27 +02:00
Christoph M. Becker
f2c2a4be9e Fix #72330: CSV fields incorrectly split if escape char followed by UTF chars 
We must not forget to properly reset the state for multibyte characters
following an escape character.
 2016-07-21 18:37:24 +02:00
Christoph M. Becker
7e2c3a77c0 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 16:50:37 +02:00
Pieter Hordijk
f813f43855 Removed incorrect (leftover?) sentence in ini 
about mbstring or iconv output handler
 2016-07-21 16:49:14 +02:00
Remi Collet
a2a122804e bump zip extension version 2016-07-21 08:44:26 +02:00
Xinchen Hui
4a643e5e13 Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property) 2016-07-21 14:25:15 +08:00
Anatol Belski
7e1843fc04 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update libs_versions.txt
 2016-07-21 01:55:42 +02:00
Anatol Belski
e7168519dd update libs_version.txt 2016-07-21 01:54:53 +02:00
Anatol Belski
8b191921c3 update libs_versions.txt 2016-07-21 01:52:03 +02:00
Ferenc Kovacs
027a82e4e6 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-21 00:37:41 +02:00
Ferenc Kovacs
c9f21e8319 update NEWs 2016-07-21 00:36:07 +02:00
Anatol Belski
462a9aa190 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  regenerate date parser with re2c 0.13.5 to fix OSX issues
 2016-07-20 18:00:53 +02:00
Anatol Belski
b57a38f584 regenerate date parser with re2c 0.13.5 to fix OSX issues 2016-07-20 17:57:39 +02:00
Anatol Belski
90c26fb6b1 regenerate date parser with re2c 0.13.5 2016-07-20 13:32:53 +02:00