php-src/ext
Stanislav Malyshev 6c884e8e84 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/phar/phar_object.c
2015-07-07 10:12:51 -07:00
..
bcmath bump year 2015-01-15 23:26:37 +08:00
bz2 bump year 2015-01-15 23:26:37 +08:00
calendar bump year 2015-01-15 23:26:37 +08:00
com_dotnet bump year 2015-01-15 23:26:37 +08:00
ctype bump year 2015-01-15 23:26:37 +08:00
curl Merge branch 'PHP-5.5' into PHP-5.6 2015-04-14 01:05:01 -07:00
date - Updated to version 2015.5 (2015e) 2015-06-15 10:41:30 +01:00
dba Merge branch 'PHP-5.5' into PHP-5.6 2015-04-08 15:54:10 +03:00
dom added regression test for bug #69679 2015-06-27 01:08:56 +02:00
enchant fix typo, see #68476 2015-06-04 18:27:08 +02:00
ereg Merge branch 'PHP-5.4.40' into PHP-5.5.24 2015-04-11 16:56:12 -07:00
exif Merge branch 'PHP-5.5' into PHP-5.6 2015-04-01 18:20:26 +03:00
fileinfo Merge branch 'PHP-5.5' into PHP-5.6 2015-04-14 15:21:47 +02:00
filter Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 09:18:31 +01:00
ftp Merge branch 'PHP-5.5' into PHP-5.6 2015-05-31 17:30:29 -07:00
gd Merge branch 'PHP-5.5' into PHP-5.6 2015-06-17 02:18:53 +02:00
gettext bump year 2015-01-15 23:26:37 +08:00
gmp Fixed bug #69803 2015-06-11 22:20:05 +02:00
hash Merge branch 'PHP-5.5' into PHP-5.6 2015-04-14 01:05:01 -07:00
iconv Merge branch 'PHP-5.5' into PHP-5.6 2015-06-11 01:52:23 -07:00
imap bump year 2015-01-15 23:26:37 +08:00
interbase bump year 2015-01-15 23:26:37 +08:00
intl Remove extraneous strlen() call 2015-03-21 08:29:12 -07:00
json Merge remote-tracking branch 'github/pr/637' into PHP-5.6 2015-04-18 17:56:33 -07:00
ldap Attempt at falling back on ldap_find_control for Mac OS 2015-07-06 14:54:04 +02:00
libxml backport af2b0669 into 5.5 2015-03-16 08:32:39 +01:00
mbstring added missing parentheses 2015-03-08 23:40:56 -07:00
mcrypt remove duplicated declaration, fix build 2015-05-21 10:56:14 +02:00
mssql bump year 2015-01-15 23:26:37 +08:00
mysql bump year 2015-01-15 23:26:37 +08:00
mysqli Merge branch 'PHP-5.5' into PHP-5.6 2015-04-01 22:08:11 +02:00
mysqlnd Merge branch 'PHP-5.5' into PHP-5.6 2015-07-07 10:12:51 -07:00
oci8 bump year 2015-01-15 23:26:37 +08:00
odbc fixed fix #69975 wrt. ODBCVER < 0x0300 2015-07-03 13:30:39 +02:00
opcache On Windows PHP may be restarted with different set of DSO extensions without SHM reset. 2015-06-29 17:45:56 +03:00
openssl fix backport mistake 2015-07-03 16:21:02 +02:00
pcntl Merge branch 'PHP-5.5' into PHP-5.6 2015-05-12 14:26:06 -07:00
pcre Merge branch 'PHP-5.5' into PHP-5.6 2015-06-23 19:32:57 +02:00
pdo bump year 2015-01-15 23:26:37 +08:00
pdo_dblib bump year 2015-01-15 23:26:37 +08:00
pdo_firebird bump year 2015-01-15 23:26:37 +08:00
pdo_mysql Merge branch 'PHP-5.5' into PHP-5.6 2015-04-02 00:07:13 +02:00
pdo_oci bump year 2015-01-15 23:26:37 +08:00
pdo_odbc bump year 2015-01-15 23:26:37 +08:00
pdo_pgsql Merge branch 'PHP-5.5' into PHP-5.6 2015-06-13 08:08:21 +02:00
pdo_sqlite bump year 2015-01-15 23:26:37 +08:00
pgsql fix test description 2015-06-09 09:18:54 +02:00
phar Merge branch 'PHP-5.5' into PHP-5.6 2015-07-07 10:12:51 -07:00
posix bump year 2015-01-15 23:26:37 +08:00
pspell bump year 2015-01-15 23:26:37 +08:00
readline Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters) 2015-02-15 22:54:05 +08:00
recode bump year 2015-01-15 23:26:37 +08:00
reflection Merge branch 'PHP-5.5' into PHP-5.6 2015-01-31 23:17:24 -08:00
session Merge branch 'PHP-5.5' into PHP-5.6 2015-04-24 16:05:50 +09:00
shmop bump year 2015-01-15 23:26:37 +08:00
simplexml Merge branch 'PHP-5.5' into PHP-5.6 2015-05-31 21:30:46 +02:00
skeleton
snmp bump year 2015-01-15 23:26:37 +08:00
soap slightly revised bug69462.phpt 2015-06-26 23:20:22 +02:00
sockets fix unknown size of void error 2015-06-25 19:12:26 +02:00
spl Fixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex()) 2015-07-07 21:25:28 +08:00
sqlite3 Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk()) 2015-07-07 21:37:35 +08:00
standard Fix test related to c22da81 2015-07-07 16:01:44 +02:00
sybase_ct bump year 2015-01-15 23:26:37 +08:00
sysvmsg bump year 2015-01-15 23:26:37 +08:00
sysvsem bump year 2015-01-15 23:26:37 +08:00
sysvshm bump year 2015-01-15 23:26:37 +08:00
tidy bump year 2015-01-15 23:26:37 +08:00
tokenizer bump year 2015-01-15 23:26:37 +08:00
wddx add tests for #68996 2015-02-07 18:52:26 +01:00
xml bump year 2015-01-15 23:26:37 +08:00
xmlreader bump year 2015-01-15 23:26:37 +08:00
xmlrpc bump year 2015-01-15 23:26:37 +08:00
xmlwriter Merge branch 'PHP-5.5-security' into PHP-5.5.24 2015-04-12 20:12:38 -07:00
xsl bump year 2015-01-15 23:26:37 +08:00
zip bump zip release to match pecl version 2015-04-15 17:37:12 +02:00
zlib Merge branch 'PHP-5.5' into PHP-5.6 2015-04-14 01:05:01 -07:00
ext_skel Merge branch 'PHP-5.5' into PHP-5.6 2014-10-01 09:26:46 +02:00
ext_skel_win32.php