1
0
mirror of https://github.com/php/php-src.git synced 2026-03-25 16:52:18 +01:00
Commit Graph

1676 Commits

Author SHA1 Message Date
Anatol Belski
fcc9386578 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  regenerate date parser with re2c 0.15.3
  regenerate date parser with re2c 0.15.3
2016-07-24 14:55:15 +02:00
Anatol Belski
da3995852e regenerate date parser with re2c 0.15.3 2016-07-24 14:53:53 +02:00
Anatol Belski
c1ca3c5e6d Merge branch 'PHP-7.0'
* PHP-7.0:
  regenerate date parser with re2c 0.13.5
2016-07-20 13:37:17 +02:00
Anatol Belski
90c26fb6b1 regenerate date parser with re2c 0.13.5 2016-07-20 13:32:53 +02:00
Derick Rethans
533266127a Merge branch 'PHP-7.0' 2016-07-20 10:21:19 +01:00
Derick Rethans
1dafa806a9 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-20 10:21:03 +01:00
Derick Rethans
18ba78e988 Regenerate with the -b flag, as we used to do.
Apparently, Apple's LLVM can't handle it otherwise o_O.
2016-07-20 10:19:53 +01:00
Nikita Popov
0bda0422af Merge branch 'PHP-7.0'
Conflicts:
	Zend/zend_vm_execute.h
2016-07-14 18:39:48 +02:00
Nikita Popov
411eee7b5a Fix leak when creating timezone with null bytes 2016-07-14 18:39:16 +02:00
Christoph M. Becker
90108a2f89 Merge branch 'PHP-7.0' 2016-07-11 16:10:15 +02:00
Christoph M. Becker
23d4c9e6c7 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 16:08:10 +02:00
Christoph M. Becker
966311e627 Bug #66836 has been fixed 2016-07-11 16:06:35 +02:00
Derick Rethans
4fe37bb5d1 Merge branch 'PHP-7.0' 2016-07-11 11:32:22 +01:00
Derick Rethans
7759d6b0db Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 11:32:10 +01:00
Derick Rethans
6a5e1783b7 Generate new .c file from .re file, as that was missing on my previous commit 2016-07-11 11:31:43 +01:00
Derick Rethans
cc89a46a89 Updated to version 2016.6 (2016f) 2016-07-06 11:15:46 +01:00
Derick Rethans
a4e140e6ab Updated to version 2016.6 (2016f) 2016-07-06 11:15:45 +01:00
Derick Rethans
884db2f7be Updated to version 2016.6 (2016f) 2016-07-06 11:15:42 +01:00
Jeremy Mikola
7aaa310d7b Export php_date_get_interface_ce() for extension use 2016-07-05 16:19:45 +02:00
Aaron Piotrowski
24237027bc Merge branch 'throw-error-in-extensions' 2016-07-05 02:08:39 -05:00
Aaron Piotrowski
9638e45d2f Return null instead of false 2016-06-29 10:02:17 -05:00
Dmitry Stogov
0cfb47651c Fixed compilation warnings 2016-06-28 11:37:51 +03:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Derick Rethans
8267a5fba7 Fixed expected test outcome due to rule changes 2016-06-15 18:31:41 +01:00
Derick Rethans
22343e8a31 Merge branch 'PHP-7.0' 2016-06-15 18:30:19 +01:00
Derick Rethans
76ec139a0a Merge branch 'PHP-5.6' into PHP-7.0 2016-06-15 18:30:03 +01:00
Derick Rethans
e0e83c0180 Fixed expected test outcome due to rule changes 2016-06-15 18:29:40 +01:00
Derick Rethans
334db3b921 Updated to version 2016.5 (2016e) 2016-06-15 11:58:51 +01:00
Derick Rethans
020541587a Updated to version 2016.5 (2016e) 2016-06-15 11:58:50 +01:00
Derick Rethans
fffa1aa0f3 Updated to version 2016.5 (2016e) 2016-06-15 11:58:47 +01:00
Nikita Popov
3389c2e6a6 Merge branch 'PHP-7.0' 2016-06-14 22:39:18 +02:00
Nikita Popov
93f7939891 Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/date/php_date.c
2016-06-14 22:38:44 +02:00
Nikita Popov
248fdfcf73 Maybe fix bug #72011 2016-06-14 22:37:27 +02:00
Aaron Piotrowski
771e5cc247 Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error 2016-06-13 09:02:17 -05:00
Aaron Piotrowski
e3c681aa5c Merge branch 'master' into throw-error-in-extensions 2016-06-10 22:02:23 -05:00
Derick Rethans
932c9520bc Merge branch 'PHP-7.0' 2016-05-18 12:19:58 +01:00
Derick Rethans
c572968900 Merge branch 'PHP-5.6' into PHP-7.0 2016-05-18 12:19:49 +01:00
Derick Rethans
f43f6fc39b Fixed bug #63740 (strtotime seems to use both sunday and monday as start of week) 2016-05-18 12:19:11 +01:00
Anatol Belski
9f5970e60a Merge branch 'PHP-7.0'
* PHP-7.0:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
2016-04-05 11:24:45 +02:00
Anatol Belski
d10a8e4804 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
2016-04-05 11:24:23 +02:00
Thomas Punt
1aea777349 Use STR_EMPTY_ALLOC macro instead 2016-04-05 11:18:14 +02:00
Thomas Punt
40f14bad33 Fix DateInterval::format segfault 2016-04-05 11:18:14 +02:00
Derick Rethans
454ae8a6f3 Updated to version 2016.3 (2016c) 2016-03-24 11:09:08 +00:00
Derick Rethans
70878a92b1 Updated to version 2016.3 (2016c) 2016-03-24 11:09:07 +00:00
Derick Rethans
c4681ec8e1 Updated to version 2016.3 (2016c) 2016-03-24 11:09:05 +00:00
Derick Rethans
92db62a32b Updated to version 2016.2 (2016b) 2016-03-15 09:14:12 +00:00
Derick Rethans
ba71144b8c Updated to version 2016.2 (2016b) 2016-03-15 09:14:11 +00:00
Derick Rethans
ddc62f2e8b Updated to version 2016.2 (2016b) 2016-03-15 09:14:09 +00:00
Anatol Belski
0c3022f436 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix DatePeriod::getEndDate() segfault
2016-03-11 14:13:11 +01:00
Anatol Belski
d26d80ab75 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix DatePeriod::getEndDate() segfault
2016-03-11 14:12:54 +01:00