e15a97f924
Merge branch 'PHP-5.5'
2013-04-03 18:51:44 +08:00
bbb4a44f98
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 18:51:19 +08:00
99ad08f9a5
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:27 +08:00
bd6a90dac7
Merge branch 'PHP-5.5'
2013-04-03 10:17:49 +08:00
6ace9c646b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-03 10:15:41 +08:00
78a9489f6a
Use new constant replace ugly trick
2013-04-03 10:12:49 +08:00
d7f709a032
Add CURL_WRAPPERS_ENABLE constant
...
see http://news.php.net/php.internals/66871
2013-04-03 10:09:51 +08:00
11262fba8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed ZTS build
2013-04-01 21:17:26 +04:00
23b44e7f39
Fixed ZTS build
2013-04-01 21:16:33 +04:00
aa1c764e3e
Merge branch 'PHP-5.5'
2013-04-01 19:16:44 +08:00
d8a5f41a60
Fixed bug parameter is casted to string of array_column
2013-04-01 19:11:45 +08:00
71a45bec35
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #79 (Optimization Problem/Bug)
fix coverage data for the opcache optimizer
2013-04-01 11:34:37 +04:00
74f158fb9d
Fixed issue #79 (Optimization Problem/Bug)
2013-04-01 11:33:04 +04:00
971676e859
Merge branch 'PHP-5.5'
2013-03-31 21:27:22 +08:00
ad7c0b1928
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-31 21:26:26 +08:00
72426a446d
Skip test when --with-curlwrappers enabled.
2013-03-31 21:22:48 +08:00
f4e16fe7ef
Merge branch 'PHP-5.5'
2013-03-31 20:08:40 +08:00
2f6b9b970c
Fix typo (it's in DateTime::__wakeup)
2013-03-31 20:07:14 +08:00
6cdf379185
Merge branch 'PHP-5.5'
2013-03-31 11:07:49 +01:00
503760c913
Updated test case and added BFN to NEWS.
2013-03-31 11:07:24 +01:00
b07ecb5501
Bug #60774 (DateInterval::format("%a") is always zero when an interval is
...
created using the createFromDateString method)
2013-03-31 10:59:21 +01:00
13004550a7
Merge branch 'PHP-5.5'
2013-03-31 10:56:23 +01:00
84208d9dc5
Added the new .c files as well as they are not automatically regenerated.
2013-03-31 10:55:45 +01:00
58a8013e5f
Rebased to PHP-5.4
...
Implemented Dmitrys change from df97c3aa0d
2013-03-31 10:45:01 +01:00
a4ca01cc2b
Made separate tests for each TZ type
...
Fixed handling of unserializing types 1 and 3
2013-03-31 10:45:00 +01:00
a1ebd82a29
Fixed the test to use %d instead of an actual number
2013-03-31 10:45:00 +01:00
30d0ae42b5
Bug 54567 DateTimeZone serialize/unserialize
...
Make DateTimeZone serializable and implement __set_state
2013-03-31 10:45:00 +01:00
bc6e26cdee
Merge branch 'PHP-5.5'
2013-03-31 10:39:11 +01:00
5dd73b9e54
Merge branch 'splitting-out-date-time-immutable' into PHP-5.5
2013-03-31 10:39:01 +01:00
68a7fec7af
Make DateTime and DateTimeImmutable siblings.
...
They both implement the DateTimeInterface interface, which specifies the
non-modifying methods of DateTime/DateTimeImmutable.
2013-03-31 10:37:16 +01:00
da43e7e0cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:24:54 -07:00
61fff1fd8b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:24:21 -07:00
1d4fcdff9f
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:22:30 -07:00
c3c4ff98ac
Merge branch 'PHP-5.5'
2013-03-29 13:01:08 +01:00
8aff7f0528
Fix "passing NULL to non-pointer argument" warnings in intl
...
The second argument to spprintf is a size_t (maximum length).
2013-03-29 12:55:00 +01:00
95f830bc81
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix BELL constant declaration
2013-03-28 22:14:50 +01:00
ac0b66f160
fix BELL constant declaration
2013-03-28 22:14:34 +01:00
f2a2b418ec
Merge branch 'PHP-5.5'
2013-03-28 19:11:21 +01:00
0e25e00ecf
Fix whitespace issue in the SOAP test
2013-03-28 19:10:57 +01:00
7f40866248
Merge branch 'PHP-5.5'
2013-03-28 19:06:13 +01:00
a5e606a2ba
Fix SOAP test
...
Doesn't look like these warnings are present anymore.
2013-03-28 19:05:06 +01:00
b472d0733a
Merge branch 'PHP-5.5'
2013-03-28 18:36:06 +01:00
dcf0b71c98
Fix tests after addition of ^ (xor) operator to ini
2013-03-28 18:35:46 +01:00
c7f1279903
Merge branch 'PHP-5.5'
2013-03-28 19:14:25 +08:00
f4daaf9250
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 19:13:58 +08:00
124a867b6a
Typo fix (greater then => greater than)
2013-03-28 19:12:08 +08:00
07a6f3c677
Merge branch 'PHP-5.5'
...
* PHP-5.5:
don't optimize script if it's not going to be cached
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
2013-03-28 13:47:38 +04:00
3ae5c55596
don't optimize script if it's not going to be cached
2013-03-28 13:45:40 +04:00
037ea6f360
Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
2013-03-28 13:34:59 +04:00
c4657614be
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed issue #78 (incorrect file path validation)
2013-03-28 12:31:33 +04:00
Xinchen Hui