Commit Graph

80171 Commits

Author SHA1 Message Date
Remi Collet
3ef71630b1 Merge branch 'PHP-5.6'
* PHP-5.6:
  move NEWS entry in the right place
2014-06-06 17:19:57 +02:00
Remi Collet
bcef1beb8f move NEWS entry in the right place 2014-06-06 17:19:35 +02:00
Nikita Popov
2adda06544 Merge branch 'PHP-5.6' 2014-06-06 17:13:08 +02:00
Nikita Popov
6d1885342c Fix bug #67392: dtrace breaks argument unpack 2014-06-06 17:09:49 +02:00
Remi Collet
acf85d89ba Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:19:28 +02:00
Remi Collet
50b980f547 NEWS 2014-06-06 14:19:21 +02:00
Remi Collet
cc6c7dd8ff Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:19:05 +02:00
Remi Collet
a53b884c47 NEWS 2014-06-06 14:18:29 +02:00
Remi Collet
38e11dfaee Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:18:17 +02:00
Remi Collet
811f35d0ed NEWS 2014-06-06 14:17:54 +02:00
Remi Collet
91bcadd85e Fix bug #67390 insecure temporary file use in the configure script 2014-06-06 14:16:04 +02:00
Remi Collet
e16097626a Merge branch 'PHP-5.6'
* PHP-5.6:
  drop exec perm on doc files
2014-06-05 17:46:21 +02:00
Remi Collet
6a5d5d1db4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  drop exec perm on doc files
2014-06-05 17:45:59 +02:00
Remi Collet
e31b51f9a0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  drop exec perm on doc files
2014-06-05 17:45:41 +02:00
Remi Collet
56c9e22c1f drop exec perm on doc files 2014-06-05 17:45:22 +02:00
Remi Collet
ce3eae4c36 fix test for 5.4/5.5 2014-06-05 17:36:20 +02:00
Remi Collet
b16950b5d3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test for 5.4/5.5
2014-06-05 17:34:32 +02:00
Remi Collet
67f1a58ac9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test for 5.4/5.5
2014-06-05 17:34:09 +02:00
Remi Collet
127651e9ae fix test for 5.4/5.5 2014-06-05 17:33:40 +02:00
Remi Collet
f11f7f5601 restore correct behavior of DateTime 2014-06-05 14:04:44 +02:00
Remi Collet
f1ef7018f0 fix test use invalid code 2014-06-05 14:01:20 +02:00
Remi Collet
aafbf93841 Merge branch 'PHP-5.6'
* PHP-5.6:
  add test for previous fix
2014-06-05 14:00:40 +02:00
Remi Collet
218df7e058 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add test for previous fix
2014-06-05 14:00:29 +02:00
Remi Collet
ab848ea400 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add test for previous fix
2014-06-05 14:00:15 +02:00
Remi Collet
15d8c80ead add test for previous fix 2014-06-05 14:00:00 +02:00
Remi Collet
2890284096 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:47:14 +02:00
Remi Collet
ce22c03a72 NEWS 2014-06-05 13:46:55 +02:00
Remi Collet
2b3f4cc29e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:46:41 +02:00
Remi Collet
c61c24ad79 NEWS 2014-06-05 13:46:13 +02:00
Remi Collet
9ea9064779 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:45:57 +02:00
Remi Collet
3f47368738 NEWS 2014-06-05 13:45:25 +02:00
Remi Collet
1fe9f1e4f5 Fix regression introduce in fix for bug #67118
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6

This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
  which is check by DATE_CHECK_INITIALIZED by later method call

Will restore consistency with other date classes in master.
2014-06-05 13:39:46 +02:00
Stanislav Malyshev
e8e907279e Merge branch 'PHP-5.6'
* PHP-5.6:
  update news
  update NEWS
  fix gcov data with some locales (again)
2014-06-04 01:11:40 -07:00
Stanislav Malyshev
3d969932bf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news
  update NEWS
  fix gcov data with some locales (again)
2014-06-04 01:11:07 -07:00
Stanislav Malyshev
4b4a5bc1d3 update news 2014-06-04 01:10:45 -07:00
Stanislav Malyshev
846e076492 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update NEWS
2014-06-04 01:10:12 -07:00
Stanislav Malyshev
e06c4f7fe5 update NEWS 2014-06-04 01:09:37 -07:00
Bob Weinand
1e85b9e86b Merge branch 'PHP-5.6'
Conflicts:
	sapi/phpdbg/phpdbg.c
2014-06-04 02:20:35 +02:00
Bob Weinand
848df6fcbe Merge sapi/phpdbg into PHP-5.6 2014-06-04 02:18:39 +02:00
Bob Weinand
7b9367971d Fix tests 2014-06-04 02:15:50 +02:00
Bob Weinand
79519f7e30 Fix possible segfault depending on memory location... 2014-06-04 02:15:34 +02:00
Bob Weinand
a1b0ae4247 Fixed startup segfault in non-debug builds
Fixes issue #87
2014-06-03 21:24:55 +00:00
Bob Weinand
241211975e PHP 5.4/5.5 compability in phpdbg_watch.c 2014-06-03 21:24:45 +00:00
Nuno Lopes
bf50218983 fix gcov data with some locales (again) 2014-06-03 17:22:16 -04:00
Nuno Lopes
2766926e29 fix gcov data with some locales (again) 2014-06-03 17:21:45 -04:00
Nuno Lopes
082f79de55 fix gcov data with some locales (again) 2014-06-03 17:21:20 -04:00
Bob Weinand
13421c55ff Update NEWS 2014-06-03 21:18:24 +00:00
Bob Weinand
466cd2aa7d Merge sapi/phpdbg into PHP-5.6 2014-06-03 21:15:02 +00:00
Bob Weinand
467b19a948 Fixed startup segfault in non-debug builds
Fixes issue #87
2014-06-03 21:03:42 +00:00
Anatol Belski
94d1014dc7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed regression introduced by patch for bug #67072
2014-06-03 20:52:30 +02:00