Anatol Belski
ec89c85054
cleaning up the version macros
2015-03-23 20:13:59 +01:00
Stanislav Malyshev
081a812b49
Merge branch 'PHP-5.6'
...
* PHP-5.6:
oops, forgot TSRMLS_CC
Conflicts:
ext/date/php_date.c
2015-03-22 21:56:40 -07:00
Stanislav Malyshev
57f835e148
oops, forgot TSRMLS_CC
2015-03-22 21:55:34 -07:00
Stanislav Malyshev
dc6d8f7838
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
Conflicts:
ext/date/php_date.c
2015-03-22 21:09:00 -07:00
Stanislav Malyshev
cc2fd00942
Merge branch 'pull-request/1145'
...
* pull-request/1145:
Putting whitespace back to the way it was.
Updating the `DateTime_verify` test to include the new method in the reflected method list
Whoops! String length....
Adding a new test for the new method
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-22 21:04:41 -07:00
Stanislav Malyshev
aa22e80b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-22 21:03:46 -07:00
Trevor Suarez
c2e22556ba
Adding a new createFromImmutable
method to the DateTime
class to mirror the current DateTime::createFromMutable()
2015-03-22 20:54:25 -07:00
Dmitry Stogov
d146d15003
Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate()
2015-03-20 02:02:42 +03:00
Dmitry Stogov
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
Trevor Suarez
98c6567e71
Putting whitespace back to the way it was.
2015-03-11 09:29:08 -04:00
Trevor Suarez
42660f3d6a
Adding a new createFromImmutable
method to the
...
`DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-05 01:58:09 -05:00
Reeze Xia
1359dfd18f
Revert mktime()/gmmktime()'s arginfo
...
$is_dst parameter has been removed in commit: 9c5eaac18b
2015-02-28 18:32:18 +08:00
Reeze Xia
968a9f4807
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2015-02-28 16:43:41 +08:00
Reeze Xia
1b240ff9e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2015-02-28 16:40:06 +08:00
Reeze Xia
f824f91ac9
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
...
This include:
- setcookie (missing "httponly")
- setrawcookie (missing "httponly")
- spl_autoload_register (missing 2 optional params)
- mktime (missing "is_dst")
- gmmktime (missing "is_dst")
2015-02-28 16:37:14 +08:00
Bob Weinand
b22caa81ee
Remove useless date warning
2015-02-27 23:27:09 +01:00
Xinchen Hui
5b8a504519
Merge branch 'PHP-5.6'
...
Conflicts:
ext/date/php_date.c
2015-02-27 11:13:07 +08:00
Xinchen Hui
2d1a3ecd27
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 11:11:45 +08:00
Taoguang Chen
e441d71baa
fix bug#68942's patch
...
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
2015-02-27 10:41:53 +08:00
Mariano Iglesias
e6819794eb
Adding 'v' formatting to DateTime::format(), and adding constant DateTime::RFC3339_EXTENDED to output datetime using the RFC3339 extended format (aka ISO8601 extended format)
2015-02-20 09:21:14 -03:00
Stanislav Malyshev
0a331f49c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TS build
2015-02-17 07:47:27 +01:00
Stanislav Malyshev
213725057e
fix TS build
2015-02-17 07:47:12 +01:00
Stanislav Malyshev
625ab10f99
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
2015-02-17 07:02:20 +01:00
Stanislav Malyshev
78389b29f9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
Port for for bug #68552
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
- BFN
2015-02-17 06:57:50 +01:00
Stanislav Malyshev
29a4e710de
Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
2015-02-17 06:53:27 +01:00
Julien Pauli
583af4979b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
2015-02-04 17:39:34 +01:00
Julien Pauli
f51b73c833
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
...
This reverts commit 8e19705a93
.
2015-02-04 17:39:16 +01:00
Dmitry Stogov
9e70d7672d
Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
2015-02-04 15:24:13 +03:00
Anatol Belski
aa5e34d79e
remove unused var
2015-01-30 10:28:57 +01:00
Derick Rethans
a3a529411e
Merge branch 'PHP-5.6'
2015-01-20 21:44:36 +00:00
Derick Rethans
1d09926e33
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-20 21:44:25 +00:00
Derick Rethans
8e19705a93
Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)
2015-01-20 21:44:19 +00:00
Nikita Popov
9c5eaac18b
Remove mktime() and gmmktime() $is_dst parameter
2015-01-17 18:26:45 +01:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Sara Golemon
365f428d46
Allow the third arg to DateTime(Immutable)::createFromFormat() to be null.
...
Permit the same meaning as not passing the arg at all.
2014-12-30 13:58:59 -08:00
Dmitry Stogov
6a992e4583
Improves strtotime() function.
2014-12-19 05:07:47 +03:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Stanislav Malyshev
85bada10c1
fix ZTS
2014-11-30 21:50:29 -08:00
m.bennewitz
4675b79e65
Conflicts:
...
ext/date/php_date.c
2014-11-30 20:49:18 -08:00
Stanislav Malyshev
9924a08558
Merge branch 'pull-request/878'
...
* pull-request/878:
#68268 : DatePeriod: Getter for start date, end date and interval
2014-11-30 20:37:37 -08:00
Stanislav Malyshev
c64949626d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Fixes memory leak introduced in 2b9af967
Conflicts:
ext/openssl/openssl.c
2014-11-30 18:32:56 -08:00
Stanislav Malyshev
de65eaa8c8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:39 -08:00
Florian MARGAINE
489bfb0af9
Fixes memory leak introduced in 2b9af967
...
Fixes https://bugs.php.net/bug.php?id=68285
2014-11-23 01:42:26 +01:00
Anatol Belski
b0499545ee
fix datatype mismatches
2014-10-30 20:06:51 +01:00
m.bennewitz
846a72a73a
#68268 : DatePeriod: Getter for start date, end date and interval
2014-10-20 08:27:56 +00:00
Florian MARGAINE
9680829389
DateTimeZone::getOffset() now accepts a DateTimeInterface
...
Fixes #68062
Should be backported to PHP-5.6 and PHP-5.5.
Conflicts:
ext/date/tests/bug67118.phpt
2014-10-04 16:06:04 +01:00
Derick Rethans
0e5f475f5e
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 15:59:17 +01:00