Lars Strojny
df8a9e1ecb
Merge branch 'PHP-5.5'
2013-01-14 18:16:48 +01:00
Lars Strojny
3ec2281298
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 18:00:00 +01:00
Lars Strojny
1e9a3ed234
Fix bug #63916 : PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite
2013-01-14 17:59:11 +01:00
Lars Strojny
0c153aeb3b
Merge branch 'PHP-5.5'
2013-01-14 17:44:03 +01:00
Lars Strojny
b16463a9fb
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 17:36:07 +01:00
Lars Strojny
99d087e5d4
Fixed bug #63921 : sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
2013-01-14 17:35:07 +01:00
Xinchen Hui
7a31692253
Merge branch 'PHP-5.5'
2013-01-14 17:09:05 +08:00
Xinchen Hui
be07f815f2
Use zend_unmangle_property_name_ex to save strlen
2013-01-14 17:08:21 +08:00
Xinchen Hui
f6260b36dd
Merge branch 'PHP-5.5'
2013-01-14 16:24:26 +08:00
Xinchen Hui
62059c16ee
Fixed bug #63980 (object members get trimmed by zero bytes)
2013-01-14 16:23:22 +08:00
Adam Harvey
5c7ae74f10
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Tinker with UPGRADING's wording for the format string changes for clarity.
2013-01-14 13:56:22 +08:00
Adam Harvey
fe27146b1b
Tinker with UPGRADING's wording for the format string changes for clarity.
2013-01-14 13:54:43 +08:00
Stanislav Malyshev
308d817fb6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:29:06 -08:00
Stanislav Malyshev
30fd25bb49
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:27:05 -08:00
Stanislav Malyshev
1a96fe0b32
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
2013-01-13 17:08:52 -08:00
Stanislav Malyshev
c6203da6c2
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 16:58:27 -08:00
Arnaud Le Blanc
bbf1c9c4a7
Merge branch 'PHP-5.5'
2013-01-13 15:47:33 +01:00
Arnaud Le Blanc
718afb9acf
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-13 15:47:12 +01:00
Arnaud Le Blanc
a06313fe5a
fixed alternate form for 'x' and 'X' formats
...
same fix exists in original code:
https://svn.apache.org/viewvc?view=revision&revision=1152309
2013-01-13 15:45:15 +01:00
Dmitry Stogov
30588d8c50
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:56 +04: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
9202225f29
Merge branch 'PHP-5.5'
...
* PHP-5.5:
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:54:01 +01: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
79dc69b75f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:59 +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
1b25386175
Merge branch 'PHP-5.5'
2013-01-09 19:15:57 +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
c328520e07
Merge branch 'PHP-5.5'
2013-01-09 19:04:05 +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
cd45e54006
Merge branch 'PHP-5.5'
2013-01-09 18:41:06 +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
96ff156f06
Merge branch 'PHP-5.5'
2013-01-09 18:31:15 +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
34d0562a4f
Merge branch 'PHP-5.5'
2013-01-09 15:33:32 +01:00
Andrey Hristov
ddcb67d446
support for password expiration in mysqlnd, through a flag
2013-01-09 15:33:07 +01:00
Andrey Hristov
8494671de4
Merge branch 'master' of ssh://git.php.net/php-src
2013-01-09 15:07:36 +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
0132cb694d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:53:05 +04: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
3f248fef05
Merge branch 'PHP-5.5'
2013-01-09 14:51:02 +01:00
