Stanislav Malyshev
84e5c8a0e2
update credits
2013-04-23 22:02:57 -07:00
Stanislav Malyshev
5e24a6e74d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:45:49 -07:00
Stanislav Malyshev
2a15aed399
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:45:10 -07:00
Stanislav Malyshev
f87d2ab893
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:55 -07:00
Stanislav Malyshev
18fdab5a09
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:35 -07:00
Pierrick Charron
b79e65f268
Remove curl wrappers
2013-04-23 17:01:17 -04:00
Remi Collet
2005a15caa
fix copy/paste in error message
2013-04-23 13:53:00 +02:00
Remi Collet
9819d81ddf
enable WebP with system libgd when available
2013-04-23 13:46:10 +02:00
Remi Collet
eb50789910
(re)allow WBMP detection with system libgd
...
provide getbmi and skipheader not exported functions in gd_compat.
2013-04-23 13:43:57 +02:00
Sara Golemon
734e165d4e
array_column() - Use entire subject array when NULL passed for second param.
...
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
2013-04-22 16:19:21 -07:00
Sara Golemon
1a03bd5dee
Allow array_column() to take -1 as a valid value in third param
...
Also do some cleanup and simplification to make this code more
readable in the long term.
2013-04-22 15:54:21 -07:00
Sara Golemon
f63db963c4
Harden array_column_basic.phpt against resource renumbering.
...
We don't care what resource number it is, so long as there's a
stream resource returned.
2013-04-22 13:36:40 -07:00
Anatol Belski
8febe2ad08
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 18:59:11 +02:00
Anatol Belski
f082d6311b
Fixed stream_socket_pair() on Windows x64 and
...
improved errorhandling in the socketpair() implementation.
2013-04-22 18:55:32 +02:00
Derick Rethans
0b2c411323
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-22 17:51:43 +01:00
Derick Rethans
70b67f2e50
- Updated to version 2013.3 (2013c)
2013-04-22 17:51:41 +01:00
Sara Golemon
7b34324f84
Fix handling of double keys in array_column
...
Also fix resource test to not localize __FILE__ to cwd.
2013-04-21 22:35:04 -07:00
Anatol Belski
f578bb0388
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:00:13 +02:00
Derick Rethans
0720804e7c
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-22 17:51:47 +01:00
Remi Collet
ec1678dd7c
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
2013-04-22 17:48:28 +02:00
Remi Collet
6889a0d1f5
overflow2 is not exported by system libgd
2013-04-22 17:39:35 +02:00
Xinchen Hui
b02241b968
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-21 11:11:02 +08:00
Xinchen Hui
32490673b9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-21 11:10:41 +08:00
Xinchen Hui
6b1928ba0b
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-21 11:09:18 +08:00
Antonio Diaz Ruiz
92bbe6be72
Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
...
Each file covers a different test case
DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
2013-04-21 11:05:59 +08:00
Pierre Joye
3cc81d151d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-20 18:24:04 +02:00
Pierre Joye
14d9f3450b
fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
2013-04-20 18:22:39 +02:00
Dmitry Stogov
c7cf9b68b6
Fixed 5.2 ZTS build
2013-04-19 21:37:24 +04:00
Andrey Hristov
7b7424c34c
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-19 16:29:53 +02:00
Andrey Hristov
39cc08c7e9
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-19 15:55:46 +02:00
Andrey Hristov
0802961bd1
lower the limit, should fit in a byte
2013-04-19 15:54:35 +02:00
Xinchen Hui
0704e4badb
Fixed compiler warning "cast from pointer to integer of different size"
2013-04-18 17:32:46 +08:00
Dmitry Stogov
5a897009a8
Initialize literals hash_value and cache_slot
2013-04-17 21:19:56 +04:00
Anatol Belski
2d9cbf720d
Added curl config test for windows
2013-04-17 14:25:45 +02:00
Pierre Joye
e71b794569
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00
Pierre Joye
4475dbf11d
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-11 06:58:04 +02:00
Pierre Joye
684f4d5272
lucky that the name is not used, fix name of encoder
2013-04-11 06:42:38 +02:00
Anatol Belski
7133eee5f2
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-10 20:51:58 +02:00
Anatol Belski
b6d54faa92
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-10 20:51:32 +02:00
Anatol Belski
56b028e590
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2013-04-10 20:50:57 +02:00
Anatol Belski
0655ab7c26
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:45:28 +02:00
Anatol Belski
ceb5b684e0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:40:28 +02:00
Anatol Belski
968ae4a56a
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:39:17 +02:00
Pierre Joye
6ea7e6da8b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-10 20:15:03 +02:00
Pierre Joye
87f5d9aa1b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:46 +02:00
Pierre Joye
c480bf3fb2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:18 +02:00
Pierre Joye
224a67fb9f
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:12:25 +02:00
Dmitry Stogov
af967de2af
Allow wilcards in opcache.blacklist_filename
2013-04-10 21:41:30 +04:00
Dmitry Stogov
e27039630a
Fixed support for PHP-5.3
2013-04-10 21:27:06 +04:00
Dmitry Stogov
2b3a4afcbf
Added missing ARG_INFO
2013-04-10 16:45:59 +04:00
Dmitry Stogov
7845f49006
Numeric string constants used as array indeces have to be converted to long at compile time
2013-04-10 15:33:08 +04:00
Dmitry Stogov
2b28f29e53
Fixed CFG construction bugs
2013-04-09 17:48:45 +04:00
Dmitry Stogov
e13d2c7c7f
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix possible NULL deref
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 12:10:54 +04:00
Pierre Joye
24f1045d55
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible NULL deref
2013-04-09 10:09:47 +02:00
Pierre Joye
aab5659357
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix possible NULL deref
2013-04-09 10:09:36 +02:00
Pierre Joye
88b3cdc4e9
fix possible NULL deref
2013-04-09 10:09:17 +02:00
Pierre Joye
1359eaa057
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-09 10:06:49 +02:00
Pierre Joye
4d6c367177
Merge branch 'PHP-5.4' into PHP-5.5
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:32 +02:00
Pierre Joye
10d62de4aa
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:17 +02:00
Pierre Joye
4d4adf47e0
fix null deref
2013-04-09 10:04:01 +02:00
Dmitry Stogov
4bf1f3801b
Fixed ZTS build
2013-04-09 12:03:41 +04:00
Dmitry Stogov
4cf00c08bd
Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
2013-04-09 11:57:28 +04:00
Dmitry Stogov
d9c9e78369
Fixed issue #82 (allow comments in blacklist file, lines started with ";")
2013-04-09 10:51:19 +04:00
Pierre Joye
83500123d0
ws and comment for recommended aa method
2013-04-09 07:04:52 +02:00
Pierre Joye
ec136c219e
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-04-09 06:47:21 +02:00
Pierre Joye
85ad65ef40
fix some unitialized values and typo
2013-04-09 06:44:45 +02:00
Anatol Belski
a9f9ff68a2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2013-04-08 16:24:20 +02:00
Anatol Belski
a35d386612
updated libmagic.patch
2013-04-08 16:23:43 +02:00
Anatol Belski
b810878e7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix ident
2013-04-08 15:51:53 +02:00
Anatol Belski
9de5dcad1c
fix ident
2013-04-08 15:51:22 +02:00
Anatol Belski
a1f66c0b50
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Refactored the previous memleak fix
2013-04-08 14:34:09 +02:00
Anatol Belski
f3ca1155d6
Refactored the previous memleak fix
...
to avoid usage of a freed pointer. Thanks Laruence )
2013-04-08 14:32:37 +02:00
Anatol Belski
9f0bfed435
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix memory leak at apprentice.c:1095
2013-04-08 12:50:25 +02:00
Anatol Belski
28e26b0fad
fix memory leak at apprentice.c:1095
2013-04-08 12:49:53 +02:00
Anatol Belski
30fc3ac6aa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL
2013-04-08 09:21:06 +02:00
Anatol Belski
b0b81c0a37
fixed EOL
2013-04-08 09:20:43 +02:00
Anatol Belski
b12f79cafb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
upgraded libmagic to 5.14
2013-04-07 22:18:53 +02:00
Anatol Belski
10367fa7c6
upgraded libmagic to 5.14
2013-04-07 22:15:56 +02:00
Xinchen Hui
5ac8084e5f
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-05 23:28:02 +08:00
Carson McDonald
39bc1bd25f
Fix typo
2013-04-05 23:27:34 +08:00
Johannes Schlüter
9587cf385e
Improve warning when trying to load zend ext as PHP module
2013-04-04 15:36:46 +02:00
Xinchen Hui
01ca2bf8c3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-04 19:31:14 +08:00
Xinchen Hui
185e5e15ae
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
2013-04-04 19:28:17 +08:00
Xinchen Hui
bbb4a44f98
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 18:51:19 +08:00
ptarjan
99ad08f9a5
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:27 +08:00
Xinchen Hui
6ace9c646b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-03 10:15:41 +08:00
Xinchen Hui
78a9489f6a
Use new constant replace ugly trick
2013-04-03 10:12:49 +08:00
Xinchen Hui
d7f709a032
Add CURL_WRAPPERS_ENABLE constant
...
see http://news.php.net/php.internals/66871
2013-04-03 10:09:51 +08:00
Dmitry Stogov
23b44e7f39
Fixed ZTS build
2013-04-01 21:16:33 +04:00
Xinchen Hui
d8a5f41a60
Fixed bug parameter is casted to string of array_column
2013-04-01 19:11:45 +08:00
Xinchen Hui
9456dac54e
Fix test
2013-04-01 18:12:16 +08:00
Dmitry Stogov
74f158fb9d
Fixed issue #79 (Optimization Problem/Bug)
2013-04-01 11:33:04 +04:00
Xinchen Hui
ad7c0b1928
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-31 21:26:26 +08:00
Xinchen Hui
72426a446d
Skip test when --with-curlwrappers enabled.
2013-03-31 21:22:48 +08:00
Xinchen Hui
2f6b9b970c
Fix typo (it's in DateTime::__wakeup)
2013-03-31 20:07:14 +08:00
Derick Rethans
503760c913
Updated test case and added BFN to NEWS.
2013-03-31 11:07:24 +01:00
EC2 Default User
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
Derick Rethans
84208d9dc5
Added the new .c files as well as they are not automatically regenerated.
2013-03-31 10:55:45 +01:00
Lonny Kapelushnik
58a8013e5f
Rebased to PHP-5.4
...
Implemented Dmitrys change from df97c3aa0d
Moved the timelib_parse_tz_cor function to ext/date/lib/timelib.c
2013-03-31 10:45:01 +01:00
Lonny Kapelushnik
a4ca01cc2b
Made separate tests for each TZ type
...
Fixed handling of unserializing types 1 and 3
2013-03-31 10:45:00 +01:00
Lonny Kapelushnik
a1ebd82a29
Fixed the test to use %d instead of an actual number
2013-03-31 10:45:00 +01:00
Lonny Kapelushnik
30d0ae42b5
Bug 54567 DateTimeZone serialize/unserialize
...
Make DateTimeZone serializable and implement __set_state
2013-03-31 10:45:00 +01:00
Derick Rethans
5dd73b9e54
Merge branch 'splitting-out-date-time-immutable' into PHP-5.5
2013-03-31 10:39:01 +01:00
Derick Rethans
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
Stanislav Malyshev
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
Sergey Akbarov
1d4fcdff9f
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:22:30 -07:00
Nikita Popov
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
Pierre Joye
ac0b66f160
fix BELL constant declaration
2013-03-28 22:14:34 +01:00
Nikita Popov
0e25e00ecf
Fix whitespace issue in the SOAP test
2013-03-28 19:10:57 +01:00
Nikita Popov
a5e606a2ba
Fix SOAP test
...
Doesn't look like these warnings are present anymore.
2013-03-28 19:05:06 +01:00
Nikita Popov
dcf0b71c98
Fix tests after addition of ^ (xor) operator to ini
2013-03-28 18:35:46 +01:00
Xinchen Hui
f4daaf9250
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-28 19:13:58 +08:00
Veres Lajos
124a867b6a
Typo fix (greater then => greater than)
2013-03-28 19:12:08 +08:00
Dmitry Stogov
3ae5c55596
don't optimize script if it's not going to be cached
2013-03-28 13:45:40 +04:00
Dmitry Stogov
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
Dmitry Stogov
031553cd01
Fixed issue #78 (incorrect file path validation)
2013-03-28 12:30:18 +04:00
Dmitry Stogov
391a41e167
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Remove unused variable
NEWS Section for beta 3
News for beta 2
2013-03-27 23:15:38 +04:00
Dmitry Stogov
1556d5df8a
Fixed issue #74 (Allowed per request OPcache disabling)
2013-03-27 23:13:21 +04:00
David Soria Parra
f92a15864b
Remove unused variable
2013-03-27 20:00:54 +01:00
Dmitry Stogov
91ab11ed07
Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)
2013-03-27 22:16:18 +04:00
Dmitry Stogov
fc7efecda0
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
add WebP support in phpinfo
2013-03-27 21:09:51 +04:00
Dmitry Stogov
f139534694
Added description for opcache.enable_cli
2013-03-27 21:02:39 +04:00
Pierre Joye
e7d88a63fa
add WebP support in phpinfo
2013-03-27 17:38:57 +01:00
Pierre Joye
f01a7e54d3
add windows 8 and windows server 2012
2013-03-27 07:29:47 +01:00
Pierre Joye
f3ebb40ad6
FALSE on error
2013-03-27 05:13:30 +01:00
Pierre Joye
5ae6f582fb
fix regression, take #2 (merge issue due to git 1.8 default setting changes)
2013-03-26 11:23:15 +01:00
Dmitry Stogov
6a7088fd18
back to dev (7.0.2-dev)
2013-03-25 13:57:50 +04:00
Dmitry Stogov
f17156c2d1
Fixed copy/paste mistake
2013-03-25 13:30:45 +04:00
Dmitry Stogov
0a00d29256
Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
2013-03-25 13:05:16 +04:00
Dmitry Stogov
64b029af0d
Separate "start_time" from "last_restart_time"
2013-03-25 12:33:24 +04:00
Dmitry Stogov
987dee9ca1
Fixed PHP-5.2 ZTS compatibility
2013-03-25 12:21:58 +04:00
Dmitry Stogov
a3316ffe6a
7.0.1 release
2013-03-25 11:44:09 +04:00
Stanislav Malyshev
c20e4bbc96
make it int main
2013-03-24 23:58:30 -07:00
Stanislav Malyshev
016fbd9991
fix return value
2013-03-24 23:43:25 -07:00
Stanislav Malyshev
385d0e52cc
add code to check if we know flock definition on this system
...
In order to configure detect it and not fail the compile.
Not an ideal solution, suggestions are welcome on how to improve it.
2013-03-24 20:11:28 -07:00
Stanislav Malyshev
504ef64c7b
fix typo
2013-03-24 20:03:57 -07:00
Stanislav Malyshev
7c0bdb9a4f
add definition for 5.5
2013-03-24 19:54:10 -07:00
Pierre Joye
4394249881
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-25 03:19:08 +01:00
Pierre Joye
1b34ab8ff8
remove comments
2013-03-25 03:14:27 +01:00
Stanislav Malyshev
c342c9b964
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:07:30 -07:00
Nikita Popov
c08e1d2be9
Fix PDO::inTransaction() test for pgsql
...
inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.
2013-03-24 17:54:05 +01:00
Nikita Popov
4633e07e29
Fix mysql_list_fields.phpt test
...
The minimum length is given in bytes, so it is charset dependent.
For utf8 charsets for example it's 3 rather than 1.
2013-03-24 17:07:16 +01:00
Pierre Joye
be3e2bb295
fix generic rotation and 90 degrees & multiples rotation, take #2
2013-03-24 16:52:20 +01:00
Nikita Popov
585f71f497
Fix some errors in mysqlnd charset list
...
I fixed the stuff that seemed obviously wrong, but there are some more
differences with the SHOW COLLATIONS output:
* The whole range of "utf16" collations missing
* "filename" missing
* "ucs2_general_mysql500_ci" and "utf8_general_mysql500_ci" missing
I wasn't sure whether those omissions are intentional, so I didn't add
them.
2013-03-24 16:09:39 +01:00
David Soria Parra
ec7250fb64
Merge commit '1ec484d' into PHP-5.5
...
* commit '1ec484d':
- add imageaffinematrixget and imagematrixconcat
- add affine matrix helper for translate, scale, rotate and shear
- fix unix build
- add new files for interpolation
- config.m4 sync with .w32
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-24 14:05:55 +01:00
Nikita Popov
aa2b54812f
Fix version check in test
2013-03-24 13:58:35 +01:00
Nikita Popov
430c987716
Skip locale dependent test if locale not available
2013-03-23 21:09:21 +01:00
Nikita Popov
c2893ab592
Missed two occurances of Revision:
2013-03-23 21:09:20 +01:00
Anatol Belski
ec25e99193
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reworked the changes for bug #64452
2013-03-23 21:00:46 +01:00
Anatol Belski
04b492a5fe
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Reworked the changes for bug #64452
2013-03-23 20:59:47 +01:00