Pierre Joye
50ceeb9f75
- fix bug #47358 , glob returns error, should be empty array()
2013-01-08 15:02:04 +01:00
Adam Harvey
56dd1e30f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add NEWS for the previously cherry picked commit.
sapi/litespeed/lsapi_main.c: Fix bug #63228
2013-01-08 11:45:49 +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
4a68c46594
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-01-07 16:46:16 +01: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
bcb3ad043a
- NEWS entry for #50524
2013-01-07 13:09:20 +01:00
Pierre Joye
7a13ce61e0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- fix the fix for bug #50524
2013-01-07 13:04:40 +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
ae0c512ffd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix windows build
News entry for bug #52126
Conflicts:
NEWS
2013-01-06 18:42:06 +01:00
Anatoliy Belsky
8a481c711a
fix windows build
2013-01-06 18:37:26 +01:00
Derick Rethans
8bca904f96
Merge branch 'master' of git.php.net:/php-src
2013-01-06 15:10:36 +00: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
65bae39770
Merge branch 'PHP-5.5'
2013-01-06 15:07:34 +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
Lars Strojny
878780c6bb
Merge branch 'PHP-5.5'
2013-01-06 15:12:07 +01:00
Martin Jansen
371372714d
Add unit test for mail.log ini setting.
2013-01-06 15:04:27 +01:00
Martin Jansen
4a3bf25e3f
Add a timestamp to the mail log.
...
This patch is loosely based on the one in bug #52126 but instead of
using a UNIX timestamp it uses the date format also being used by
error_log et al.
2013-01-06 15:04:19 +01:00
Lars Strojny
925da6b14d
Merge branch 'PHP-5.5'
2013-01-06 14:55:05 +01:00
Lars Strojny
853ef3c9cb
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-06 14:54:40 +01:00
Lars Strojny
bdc1e2302c
Adding test for bug #63462
2013-01-06 14:46:49 +01:00
Derick Rethans
ff9c1b12ff
Fixed bug #55397 : Comparsion of incomplete DateTime causes SIGSEGV.
2013-01-06 13:39:34 +00:00
Lars Strojny
44f564e3e6
Merge branch 'PHP-5.5'
2013-01-06 14:12:19 +01:00
Lars Strojny
9934efff5f
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-06 14:10:07 +01:00
Lars Strojny
d7da1aa694
Coding style, ANSI C compatibility
2013-01-06 14:08:23 +01:00
Xinchen Hui
786d34f13b
Merge branch 'PHP-5.5'
2013-01-06 10:25:04 +08:00
Xinchen Hui
742b0e5b92
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-01-06 10:23:51 +08:00
Lars Strojny
9fae5b68c8
Merge branch 'PHP-5.5'
2013-01-06 03:23:36 +01:00
Xinchen Hui
cbb5d42b9b
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-06 10:23:21 +08:00
Lars Strojny
ec2fff80e7
Bug #23955 : allow specifiy max age for setcookie()
2013-01-06 03:22:44 +01:00
Xinchen Hui
a426e0b050
bump year
2013-01-06 10:22:15 +08:00
Xinchen Hui
a3a699e090
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-06 10:20:10 +08:00
Xinchen Hui
c2f8e90504
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb
bump year
2013-01-06 10:19:09 +08:00
Lars Strojny
8e5460ad86
Adding test from 5.5
2013-01-06 03:15:08 +01:00
Lars Strojny
67557fcfce
Bug #63699 : performance improvements for varios ext/date functions
2013-01-06 03:06:09 +01:00
Lars Strojny
ce76ec56d9
Merge branch 'PHP-5.5'
2013-01-06 02:11:34 +01:00
Lars Strojny
f3824ad166
Bug #63699 performance improvements for ext/date by only validating timezone when timezone is set
2013-01-06 02:10:16 +01:00
Pierrick Charron
4084a02ff9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improve resource management for curl handle
2013-01-05 11:12:00 -05:00
Pierrick Charron
f85e5950ab
Improve resource management for curl handle
...
Previous implementation was using its own refcounting (uses field of
the php_curl struct). zend_list_add/remove already implements its own
refcount, so we don't need to use an other one.
2013-01-05 11:07:59 -05:00
Xinchen Hui
8a2208a33c
Merge branch 'PHP-5.5'
2013-01-04 11:06:26 +08:00
Xinchen Hui
c4f2a20f15
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-04 11:05:53 +08:00
Xinchen Hui
2feea39a33
Update NEWS
2013-01-04 11:05:24 +08:00