Derick Rethans
62129f31a7
Make DatePeriod support DateTimeImmutable as well.
...
If the start element is a DateTimeImmutable object, then all returned objects
are also DateTimeImmutable objects. If the start element is a DateTime object,
then all returned objects are DateTime objects.
2013-01-12 15:16:25 +00:00
Derick Rethans
793b52b576
Fixed crash bug when the non-OO interface was used.
2013-01-12 15:16:25 +00:00
Derick Rethans
8b9d23c0cf
Rename DateTimePoint to DateTimeImmutable.
2013-01-12 15:16:25 +00:00
Derick Rethans
0f679b926c
Added another test to test the unmodified inherited methods.
2013-01-12 15:16:25 +00:00
Derick Rethans
99e7d1dca2
Added a few missing TSRMLS_DC/TSRMLS_CC.
2013-01-12 15:16:25 +00:00
Derick Rethans
21d7efef92
Added a test case for DateTimePoint.
2013-01-12 15:16:25 +00:00
Derick Rethans
9657591e35
Implemented immutable DateTime objects as the DateTimePoint class.
2013-01-12 15:16:24 +00:00
Dmitry Stogov
52dd0d1c73
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:37 +04:00
Dmitry Stogov
046ae2f77c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:19 +04:00
Dmitry Stogov
e1410b5a70
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:53:10 +04:00
ULF WENDEL
f787e21ef5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:53:46 +01:00
ULF WENDEL
36e88d78e6
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:51:14 +01:00
Remi Collet
b3a934bdb3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:25 +01:00
Remi Collet
f659ec108f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:17:53 +01:00
Remi Collet
dc9f0e70b7
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle)
...
See commit c05ee74e7f
2013-01-10 11:14:38 +01:00
Andrey Hristov
846e506a3d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 19:15:29 +01:00
Andrey Hristov
d430b5a4eb
Add mysqli support - constants and checking in mysqli_options() for the
...
new constant for password expriration
2013-01-09 19:14:48 +01:00
Andrey Hristov
790096b68b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd_enum_n_def.h
2013-01-09 19:03:56 +01:00
Andrey Hristov
258c76eb41
backport handling of expired passwords in mysqlnd to 5.4
2013-01-09 18:58:29 +01:00
Andrey Hristov
1f7f8429af
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-01-09 18:40:57 +01:00
Andrey Hristov
bcd278ad7f
fix compilation error after merge
2013-01-09 18:39:59 +01:00
Andrey Hristov
cb6071ef54
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-01-09 18:30:56 +01:00
Andrey Hristov
6a6ec195ac
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea
Use during connect the flags set with set_client_option()
2013-01-09 18:27:06 +01:00
Andrey Hristov
ddcb67d446
support for password expiration in mysqlnd, through a flag
2013-01-09 15:33:07 +01:00
Andrey Hristov
83f736aad4
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-01-09 15:07:26 +01:00
Dmitry Stogov
c3ebd6305e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:52:48 +04:00
Andrey Hristov
b8a369f522
Add new constants
2013-01-09 14:50:43 +01:00
Dmitry Stogov
625000ab44
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:36:44 +04:00
Dmitry Stogov
d4650c5d69
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:16:47 +04:00
Dmitry Stogov
326f896739
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
Conflicts:
NEWS
2013-01-09 11:32:40 +04:00
Dmitry Stogov
f9e8678dd3
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
2013-01-09 11:30:50 +04:00
Xinchen Hui
6deb8361f3
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 10:57:47 +08:00
Xinchen Hui
f3b1b85169
update NEWS
2013-01-09 10:55:50 +08:00
Xinchen Hui
15aaa9c660
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 10:54:23 +08:00
Xinchen Hui
c05ee74e7f
Fixed bug #63943 (Bad warning text from strpos() on empty needle)
2013-01-09 10:53:20 +08:00
Adam Harvey
9566314d62
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS for the previously cherry picked commit.
sapi/litespeed/lsapi_main.c: Fix bug #63228
Conflicts:
sapi/litespeed/lsapi_main.c
2013-01-08 11:45:26 +08:00
Adam Harvey
6e684e6a6c
Add NEWS for the previously cherry picked commit.
2013-01-08 11:40:51 +08:00
George Wang
9c52d09ebc
sapi/litespeed/lsapi_main.c: Fix bug #63228
...
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2013-01-08 11:40:13 +08:00
Andrey Hristov
cde53e7fcd
fix different values of mysqli_stmt_affected_rows between libmysql
...
and mysqlnd (in favor of libmysql) before execute and after prepare()
2013-01-07 16:36:21 +01:00
Pierre Joye
f4142a92b2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- fix the fix for bug #50524
2013-01-07 13:04:29 +01:00
Pierre Joye
a71e91626a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- fix the fix for bug #50524
2013-01-07 13:04:04 +01:00
Pierre Joye
c0fae054c9
- fix the fix for bug #50524
2013-01-07 13:03:12 +01:00
Anatoliy Belsky
8a481c711a
fix windows build
2013-01-06 18:37:26 +01:00
Derick Rethans
98331c89a1
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2013-01-06 15:10:16 +00:00
Derick Rethans
0de5fb4165
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-01-06 15:09:55 +00:00
Derick Rethans
67c662a0a2
Update news with new bug fix.
2013-01-06 15:08:26 +00:00
Derick Rethans
4ff088d061
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-06 15:07:25 +00:00
Derick Rethans
ba35ae32b7
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-06 15:07:13 +00:00
Lars Strojny
a951693cfb
News entry for bug #52126
2013-01-06 15:13:32 +01:00