mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-22 19:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
100,972 Commits 505 Branches 1,391 Tags 824 MiB
f8ff4c4918
Commit Graph

100972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
f8ff4c4918 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-12 12:31:20 +02:00
Bob Weinand
a55af1e271 Fixed bug #75363 (openssl_x509_parse leaks memory) 2017-10-12 12:30:20 +02:00
Anatol Belski
677cd85cb7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  It looks like i should've taken joint response on ext/fileinfo long ago
 2017-10-11 22:24:52 +02:00
Anatol Belski
23e97b0222 It looks like i should've taken joint response on ext/fileinfo long ago 2017-10-11 22:21:34 +02:00
Anatol Belski
f63a0fef6b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Put php-sdk-2.0.12beta1 for AppVeyor
 2017-10-11 20:30:40 +02:00
Anatol Belski
d432bdb4ab Put php-sdk-2.0.12beta1 for AppVeyor 
Quite some tool upgrades there, especially re2c 1.0.2
 2017-10-11 20:27:27 +02:00
Christoph M. Becker
d3d23e0cb8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
 2017-10-11 17:29:36 +02:00
Christoph M. Becker
787bf7eaf7 Merge branch 'pull-request/2798' into PHP-7.0 
* pull-request/2798:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
 2017-10-11 17:28:30 +02:00
Christoph M. Becker
62098a10aa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use PHP_VERSION for exif
 2017-10-11 14:43:51 +02:00
Christoph M. Becker
b497b6edf9 Merge branch 'pull-request/2799' into PHP-7.0 
* pull-request/2799:
  Use PHP_VERSION for exif
 2017-10-11 14:42:46 +02:00
Joe Watkins
c2bfdf3712
bump version 2017-10-10 16:12:36 +01:00
Christoph M. Becker
fee21a45df Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] Add NEWS entry for bug #75349
 2017-10-10 13:56:47 +02:00
Christoph M. Becker
c8eccf8451 [ci skip] Add NEWS entry for bug #75349 2017-10-10 13:54:52 +02:00
Anatol Belski
30f121f9bc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix re2c version detection
 2017-10-10 12:59:14 +02:00
Anatol Belski
d1fc9b425f Fix re2c version detection 2017-10-10 10:52:52 +02:00
Anatol Belski
c8732b1c5f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move dev to 7.0.26
 2017-10-10 08:27:37 +02:00
Anatol Belski
51658bac35 Move dev to 7.0.26 2017-10-10 08:26:04 +02:00
Anatol Belski
d8881f4eb4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix array access on undeclared properties in DateInterval
 2017-10-09 15:38:21 +02:00
Anatol Belski
f48abfa902 Fix array access on undeclared properties in DateInterval 2017-10-09 15:35:38 +02:00
Anatol Belski
dc3b9fe619 Fix ftok() multibyte path support 2017-10-09 13:12:40 +02:00
Sara Golemon
ac1fd769ad Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
 2017-10-07 10:13:54 -04:00
Sara Golemon
843e492c68
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS 2017-10-07 10:08:34 -04:00
Christoph M. Becker
0f55138533 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
 2017-10-06 16:46:51 +02:00
Christoph M. Becker
ec3d864784 Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional) 
Of course, reflection has to know that as well.
 2017-10-06 16:45:07 +02:00
Nikita Popov
d34c8fa802 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-05 12:25:37 +02:00
Mathieu CARBONNEAUX
6b9ccda936 Fixed bug #75311 2017-10-05 12:24:57 +02:00
Peter Kokot
74124de048 Use PHP_VERSION for exif 2017-10-04 23:25:36 +02:00
Dmitry Stogov
b6e34eaf04 Fixed rarely possible use-after-free 2017-10-04 16:38:55 +03:00
Dmitry Stogov
c935b832dc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:58:32 +03:00
Dmitry Stogov
1195de87ff Bumped ext/oci8 version 2017-10-04 09:56:25 +03:00
Dmitry Stogov
ee50fcfa27 Merge branch 'oci8_fix' into PHP-7.0 
* oci8_fix:
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs
 2017-10-04 09:49:40 +03:00
Dmitry Stogov
24e595bf26 Use dereferenced value 2017-10-03 10:49:56 +03:00
Joe Watkins
d0cda9d0bd
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Typo in status.html
 2017-10-03 07:22:04 +01:00
Viktor Szépe
e995b7e475
Typo in status.html 
feet needs -> fit needs
 2017-10-03 07:21:53 +01:00
Joe Watkins
1322c2c86a
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #74905
 2017-10-03 07:19:00 +01:00
Peter Kokot
6d1dd8b0af
Fix bug #74905 2017-10-03 07:18:38 +01:00
Joe Watkins
2019b25daa
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Remove ident gitattribute for ext/zip/php_zip.c
 2017-10-03 07:15:02 +01:00
Peter Kokot
7b248a1b32
Remove ident gitattribute for ext/zip/php_zip.c 2017-10-03 07:14:50 +01:00
Dmitry Stogov
4d69587035 Fixed compilation errors 2017-10-03 09:08:28 +03:00
Dmitry Stogov
c8dea7ae1e Restored code for BOOL variables 2017-10-02 17:04:26 +03:00
Remi Collet
03aef5f65c NEWS 2017-10-02 11:26:08 +02:00
Remi Collet
fa78afa112 Fixed bug #75303 sha3 hangs on bigendian 2017-10-02 11:25:23 +02:00
Fabien Villepinte
9d9873b3b5 Fix Bug #75299 Wrong reflection on inflate_init and inflate_add 2017-10-01 11:27:16 +02:00
Andrea Faulds
4372293192 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-29 21:38:30 +01:00
Andrea Faulds
abefb6dfe7 Fix bug #75290 2017-09-29 21:38:08 +01:00
Xinchen Hui
9fd33c1f20 Fixed bug #75267 (possible &/&& mixup) 2017-09-29 11:16:32 +08:00
Sara Golemon
b5bc88c64e Fix word alignment on ILP64. 2017-09-28 10:45:51 -04:00
Anatol Belski
db9778dfb2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Apply upstream patch for CVE-2016-1283
 2017-09-28 15:44:40 +02:00
Anatol Belski
d11fceab15 Apply upstream patch for CVE-2016-1283 
Fix bug #75207, see also
https://bugzilla.redhat.com/show_bug.cgi?id=1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636
 2017-09-28 15:40:49 +02:00
Anatol Belski
72c008f945 Fix mkdir() special case for path length < 260 and > 248 2017-09-28 13:18:31 +02:00