Commit Graph

82209 Commits

Author SHA1 Message Date
Matteo Beccati
df490dcf0c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix segfault in ext/date since 957aa2
2015-04-28 10:57:52 +02:00
Matteo Beccati
b5e5098c50 Fix segfault in ext/date since 957aa2 2015-04-28 10:57:18 +02:00
Stanislav Malyshev
19ad1389aa Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:30:57 -07:00
Stanislav Malyshev
13c32a102c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:25:32 -07:00
Stanislav Malyshev
23917b451b Upgrade PCRE to 8.36, it fixes some crashes
We probably will need to go to 8.37 once it is released.
2015-04-27 23:16:54 -07:00
Derick Rethans
1e18ffd2f8 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-26 11:04:35 +01:00
Derick Rethans
957aa220aa Fixed location reading due to file format changes 2015-04-26 11:04:16 +01:00
Derick Rethans
ad9aaf8093 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:33 +01:00
Derick Rethans
73a07522ef Empty merge 2015-04-24 17:22:32 +01:00
Derick Rethans
53c49994f2 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:31 +01:00
Yasuo Ohgaki
02ff308e27 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Set NULL after efree
2015-04-24 16:05:50 +09:00
Yasuo Ohgaki
4c711200b4 Set NULL after efree 2015-04-24 16:04:01 +09:00
Lior Kaplan
4fd3c8aebb Add entry for bug #69152 in 5.6.8 2015-04-22 19:40:56 +03:00
Lior Kaplan
b35c02e2df Add entry for bug #69152 in 5.5.24 2015-04-22 19:38:26 +03:00
Lior Kaplan
bfa7e11c9c Format alignment 2015-04-22 18:19:45 +03:00
Lior Kaplan
e48305cdb5 Bug #68846 was fixed in 5.6.8 by 934d6ed9 2015-04-22 18:10:37 +03:00
Lior Kaplan
59f6d7cd4f Add merged bug fixes into 5.5.24
Done in commits 25cb6f00 and 363e6ce6
2015-04-22 17:41:34 +03:00
Xinchen Hui
9db4e25927 Since 5.6 stat.cwd using emalloc (Thanks to Remi) 2015-04-22 15:14:00 +08:00
Xinchen Hui
29c449ce98 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-21 22:44:45 +08:00
Xinchen Hui
a508693874 Remove tail blank which is committed by accident 2015-04-21 22:44:22 +08:00
Xinchen Hui
ceb992501b Update NEWS 2015-04-21 22:37:25 +08:00
Xinchen Hui
9d9ba493a2 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-21 22:37:00 +08:00
Xinchen Hui
c667c26f61 Fixed Bug #69467 (Wrong checked for the interface by using Trait) 2015-04-21 22:36:32 +08:00
Anatol Belski
160bf9c072 updated NEWS 2015-04-19 20:33:09 +02:00
Anatol Belski
0ec5477fbd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  fix more dir separators
2015-04-19 20:32:37 +02:00
Anatol Belski
35baf71466 updated NEWS 2015-04-19 20:30:43 +02:00
Anatol Belski
a0accfa59f fix more dir separators 2015-04-19 20:27:28 +02:00
Stanislav Malyshev
d66cb721d4 Merge remote-tracking branch 'github/pr/637' into PHP-5.6
* github/pr/637:
  Remove unused code from ext/json.
2015-04-18 17:56:33 -07:00
Remi Collet
1302eb7f72 relax tests with huge year (new zic) 2015-04-18 10:00:15 +02:00
Remi Collet
3bbfb96e1a ignore second value for huge timestamp test (new zic) 2015-04-18 09:37:06 +02:00
Remi Collet
3c81e945a3 relax test for date < INT32_MIN (new zic) 2015-04-18 09:28:29 +02:00
Remi Collet
984f4b09e0 relax bigbang content (new zic) 2015-04-18 09:11:39 +02:00
Remi Collet
cd93b120c3 Make date transitions tests more flexible
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
2015-04-18 07:47:47 +02:00
Hannes Magnusson
ffb788800f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail
  Fixed res leak
2015-04-17 10:14:12 -07:00
Hannes Magnusson
b5b8cd5074 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail
  Fixed res leak
2015-04-17 10:06:31 -07:00
Hannes Magnusson
983f155e1c phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail 2015-04-17 10:05:32 -07:00
Anatol Belski
042fa25896 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance
2015-04-17 17:13:45 +02:00
Anatol Belski
e09febb286 fix column name attribute with ODBC 3.0 2015-04-17 17:10:46 +02:00
Anatol Belski
db1596c8b1 migrate SQLAllocStmt for ODBC 3.0 compliance 2015-04-17 17:06:00 +02:00
Remi Collet
342acbe1c6 skip test when xml not available 2015-04-17 15:20:22 +02:00
Nikita Popov
25e45a9350 Run gmp_random tests more quickly 2015-04-16 16:29:57 +02:00
Nikita Popov
7e049b0427 Normalize gmp_remroot() behavior to GMP 5.1 2015-04-16 16:27:42 +02:00
Nikita Popov
8e167a2a00 Fix leak in gmp_pow() 2015-04-16 16:04:19 +02:00
Ferenc Kovacs
60830f49c0 this was reverted 2015-04-15 20:04:03 +02:00
Ferenc Kovacs
4ddb92be45 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  66550 will be part of 5.5.24
2015-04-15 19:54:30 +02:00
Ferenc Kovacs
ef5f4ef81f 66550 will be part of 5.6.8 2015-04-15 19:54:25 +02:00
Ferenc Kovacs
b75e30c667 66550 will be part of 5.5.24 2015-04-15 19:53:38 +02:00
Ferenc Kovacs
272805c898 reorder entries, Core is always the first block 2015-04-15 18:53:22 +02:00
Ferenc Kovacs
ad5723acf2 add missing NEWS entry 2015-04-15 18:39:16 +02:00
Ferenc Kovacs
a07f3ed2a6 add missing space to the NEWS entries to align properly 2015-04-15 18:38:48 +02:00