php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 04:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,531 Commits 547 Branches 1,483 Tags
7b8b2e50f6efacb52aed4fa500a16638c56c8ca4
Commit Graph

101531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rasmus Lerdorf
7b8b2e50f6 Switch to the v2 version of these functions. 
The sqlite3 docs suggest always using prepare_v2 and the close_v2
could potentially help with an fd leak we have been seeing
 2017-01-22 07:26:07 -08:00
Christoph M. Becker
5d0048cd75 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add regression test for bug #47946
 2017-01-22 15:15:43 +01:00
Christoph M. Becker
4af464a0df Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add regression test for bug #47946
 2017-01-22 15:02:59 +01:00
Christoph M. Becker
71efe9d8fd Add regression test for bug #47946 
This bug had already been fixed, but apparently there's no regression
test yet, so we add one.

Note that the expected image has black pixel artifacts, which are
another issue (perhaps bug #40158), and would have to be adressed
separately.
 2017-01-22 15:01:01 +01:00
Andrey Andreev
423c192791 Use hash_ops->is_crypto in hash_init() 2017-01-22 10:37:10 +01:00
Joe Watkins
d6ef39e04a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix intermittent segfault in GD library
 2017-01-22 06:41:20 +00:00
Joe Watkins
55393e26a5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix intermittent segfault in GD library
 2017-01-22 06:41:07 +00:00
Mitch Hagstrand
e56fe7e5e7 Fix intermittent segfault in GD library 
The gdIOCtx struct should be zero filled with ecalloc.
emalloc does not zero fill the struct.
 2017-01-22 06:40:55 +00:00
Christoph M. Becker
5d6e702732 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add myself as primary maintainer of GD
 2017-01-21 18:55:13 +01:00
Christoph M. Becker
722375c603 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add myself as primary maintainer of GD
 2017-01-21 18:53:43 +01:00
Christoph M. Becker
42d53f3bc0 Add myself as primary maintainer of GD 2017-01-21 18:52:34 +01:00
Levi Morrison
b7552ff344 Remove trailing tabs 2017-01-21 10:11:23 -07:00
Christoph M. Becker
ee06ca8271 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix #73968: Premature failing of XBM reading
 2017-01-21 13:20:47 +01:00
Christoph M. Becker
7a2497b2c5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73968: Premature failing of XBM reading
 2017-01-21 13:18:54 +01:00
Christoph M. Becker
f67d599a01 Fix #73968: Premature failing of XBM reading 
We must take into account the line padding, when we're reading XBM
files.

We deliberately ignore the potential integer overflow here, because
that would be caught by gdImageCreate() or even earlier if `bytes==0`,
what happens in libgd00094.phpt which we adapt accordingly.
 2017-01-21 13:04:36 +01:00
Joe Watkins
1c807377fd Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73961 environmental build dependency in hash sha3 source
 2017-01-21 07:46:52 +00:00
Joe Watkins
1ff27053f9 Fix bug #73961 environmental build dependency in hash sha3 source 2017-01-21 07:45:28 +00:00
Anatol Belski
0ccf1cf562 Merge branch 'PHP-7.1' 
* PHP-7.1:
  backport 51e1da6ea1 into 7.0
 2017-01-21 02:59:07 +01:00
Anatol Belski
3020be675a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  backport 51e1da6ea1 into 7.0
 2017-01-21 02:57:54 +01:00
Anatol Belski
8da8756312 backport 51e1da6ea1 into 7.0 2017-01-21 02:56:15 +01:00
Anatol Belski
d263f29b71 Merge branch 'PHP-7.1' 
* PHP-7.1:
  exclude debug code
  ensure the string for conversion is \0 terminated and integrade additional path length check
 2017-01-21 02:20:52 +01:00
Anatol Belski
51e1da6ea1 exclude debug code 2017-01-21 02:17:06 +01:00
Anatol Belski
6b6122a957 ensure the string for conversion is \0 terminated and integrade 
additional path length check
 2017-01-21 02:11:24 +01:00
Anatol Belski
73bfa264cc Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73962 bug with symlink related to cyrillic directory
 2017-01-20 23:47:12 +01:00
Anatol Belski
95406c878a Fixed bug #73962 bug with symlink related to cyrillic directory 2017-01-20 23:45:08 +01:00
Joe Watkins
0877839469 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed #73959 - lastInsertId fails to throw an exception in pdsql
 2017-01-20 20:12:30 +00:00
Joe Watkins
d6feb2edbd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #73959 - lastInsertId fails to throw an exception in pdsql
 2017-01-20 20:11:49 +00:00
andrewnester
21ac79e94b Fixed #73959 - lastInsertId fails to throw an exception in pdsql 2017-01-20 20:10:55 +00:00
Remi Collet
fa45f64bd8 Merge branch 'PHP-7.1' 
* PHP-7.1:
  NEWS
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled
 2017-01-20 17:50:09 +01:00
Remi Collet
d6c9f91e2e NEWS 2017-01-20 17:46:41 +01:00
Remi Collet
7ea7d3d829 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled
 2017-01-20 17:46:24 +01:00
Remi Collet
2e3d68ed1b NEWS 2017-01-20 17:46:11 +01:00
Remi Collet
f81b7df618 Fixed bug #73965 DTrace reported as enabled when disabled 2017-01-20 17:45:15 +01:00
Dmitry Stogov
1f7bf2bfd6 Optimized extract(). Avoided double hash lookups and repeatable checks through loop splitting. 2017-01-20 10:39:27 +03:00
Joe Watkins
71a42477ca Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update comment, incorrect since 224aaf94
 2017-01-19 10:49:09 +00:00
SjonHortensius
631861e1fa Update comment, incorrect since 224aaf94 
In 224aaf94; the warning was enabled; making the comment above incorrect. I've updated the comment to reflect the current code
 2017-01-19 10:48:54 +00:00
Xinchen Hui
0311dc8697 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed another part in ldap (bug #73933)
 2017-01-19 12:24:04 +08:00
Xinchen Hui
5e09031144 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed another part in ldap (bug #73933)
 2017-01-19 12:23:56 +08:00
Xinchen Hui
cad2598fcb Fixed another part in ldap (bug #73933) 2017-01-19 12:23:23 +08:00
Ferenc Kovacs
60d075aa65 Merge branch 'PHP-7.1' 2017-01-19 01:23:36 +01:00
Ferenc Kovacs
2efb63bf00 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-19 01:22:10 +01:00
Ferenc Kovacs
8c75dbc498 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-19 01:20:57 +01:00
Ferenc Kovacs
cf649f59cb update NEWS 2017-01-19 01:16:31 +01:00
Nikita Popov
0dc2b832a2 Merge branch 'PHP-7.1' 2017-01-18 21:20:07 +01:00
Nikita Popov
fec3a65ba4 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 21:20:00 +01:00
Mitch Hagstrand
8ba6d622e5 Removing zmemcheck from .gdbinit 
It doesn't seem to make sense anymore
 2017-01-18 21:19:48 +01:00
Andrey Andreev
d89d149edf Disallow non-crypto hashes in HMAC and PBKDF2 
For this purpose add is_crypto flag to php_hash_ops.
 2017-01-18 21:13:54 +01:00
Joe Watkins
5bc81620ef Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73949 leak in mysqli_fetch_object
 2017-01-18 18:24:49 +00:00
Joe Watkins
6d89640d55 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73949 leak in mysqli_fetch_object
 2017-01-18 18:23:59 +00:00
Joe Watkins
f9226f9bf3 Fix bug #73949 leak in mysqli_fetch_object 2017-01-18 18:22:57 +00:00