Derick Rethans
88067b6e60
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/date/php_date.c
2013-11-28 14:30:08 +00:00
Derick Rethans
aab0b2ce3b
Marking those two as XFAIL for now.
2013-11-28 14:24:39 +00:00
Bob Weinand
d36cf90291
Merge branch 'const_scalar_exprs' into PHP-5.6
...
Conflicts:
Zend/zend_extensions.h
2013-11-28 13:41:42 +01:00
Derick Rethans
582f6e529e
Fixed a few DST changeover issues.
2013-11-28 12:02:36 +00:00
Derick Rethans
5d0c526199
Move add/sub to timelib.
2013-11-28 12:02:36 +00:00
Derick Rethans
324e6a5f82
Fix backwards transition diffs.
2013-11-28 12:02:36 +00:00
Derick Rethans
aa26ace21f
Split up tests into their different categories.
2013-11-28 12:02:35 +00:00
Derick Rethans
7a0df7be34
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
2013-11-28 12:02:35 +00:00
Derick Rethans
6e8b2c91c4
Fixed forward transitions in diffs.
2013-11-28 12:02:35 +00:00
Derick Rethans
261c6b31ca
Always reset those parameters.
2013-11-28 12:02:35 +00:00
Derick Rethans
44a9e6b484
Fixed "Forward Transition" construction of DateTime objects.
...
This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.
2013-11-28 12:02:35 +00:00
Derick Rethans
d3a12317cf
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-27 22:01:09 +00:00
Derick Rethans
4587ef569a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-27 22:01:03 +00:00
Derick Rethans
23ab2575e1
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-27 21:59:46 +00:00
Remi Collet
56909e7d9d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:15:58 +01:00
Remi Collet
28d215d0a8
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:15:08 +01:00
Remi Collet
12fe4e90be
Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:13:16 +01:00
Stanislav Malyshev
22ad8e1b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.24-dev now
merge fix
add test
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-27 00:18:54 -08:00
Andrey Hristov
0fc90b100d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-26 20:10:30 +02:00
Dmitry Stogov
834eaae52d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:59:02 +04:00
Dmitry Stogov
de65817136
Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:57:32 +04:00
Dmitry Stogov
f000624864
Added an optimization of class constants and constant calls to some internal functions
2013-11-26 21:37:31 +04:00
Andrey Hristov
9a6b72a05a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26 19:15:43 +02:00
Andrey Hristov
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
Andrey Hristov
0aadab0e2e
add test
2013-11-26 19:15:12 +02:00
Andrey Hristov
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
Dmitry Stogov
e7132597a6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:01:01 +04:00
Dmitry Stogov
d79dd9cc1c
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:00:00 +04:00
Dmitry Stogov
27524b52b5
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 19:55:49 +04:00
Dmitry Stogov
0999d85049
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Conflicts:
NEWS
2013-11-26 17:48:11 +04:00
Dmitry Stogov
d85ac7fb3f
Fixed bug #66176 (Invalid constant substitution)
2013-11-26 17:47:02 +04:00
Dmitry Stogov
8fdc973afa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test
2013-11-26 12:14:12 +04:00
Dmitry Stogov
f28ac55b6d
Added test
2013-11-26 12:13:42 +04:00
Dmitry Stogov
621f83e35c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
bring the news
Conflicts:
NEWS
2013-11-26 11:36:23 +04:00
Dmitry Stogov
a8c7e50f4d
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
2013-11-26 11:34:41 +04:00
Dmitry Stogov
b3c2c2bcb1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)
Conflicts:
NEWS
2013-11-25 14:11:45 +04:00
Dmitry Stogov
b7b6c35eea
Fixed compatibility with old PHP versions
2013-11-25 14:09:57 +04:00
Dmitry Stogov
27dc82d0ec
Fixed bug #65915 (Inconsistent results with require return value)
2013-11-25 14:07:24 +04:00
Anatol Belski
696d286911
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
And here is the real fix for #66124
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:29:35 +01:00
Anatol Belski
ad5a63e8bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2013-11-21 21:29:02 +01:00
Anatol Belski
345032946c
fixed test
2013-11-21 21:24:47 +01:00
Andrey Hristov
763f4aef8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269
And here is the real fix for #66124
2013-11-21 21:29:21 +02:00
Andrey Hristov
c2b2afacc0
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:15:22 +02:00
Andrey Hristov
4a1c9be857
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:14:42 +02:00
Yasuo Ohgaki
bf91f101a6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:25:04 +09:00
Yasuo Ohgaki
b8b92bd790
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05
Fix WS in serialization_error_002.phpt
2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:14:53 +09:00
Jeff Welch
72a8489a12
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:34 +09:00
Jeff Welch
101c780500
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:23 +09:00
Jeff Welch
b4210efe76
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:14:32 +09:00
kovacs.ferenc
2042d78fce
Merge branch 'JSONCaseFix' of git://github.com/TazeTSchnitzel/php-src into TazeTSchnitzel-JSONCaseFix
2013-11-18 12:12:24 +01:00
Xinchen Hui
140a42f779
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-17 17:20:13 +08:00
Xinchen Hui
de79c51555
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
2013-11-17 17:04:37 +08:00
Remi Collet
4508a84d0d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix Bug #65714 PHP cli forces the tty to cooked mode
2013-11-15 09:53:07 +01:00
Remi Collet
b8d88bf2c5
Fix Bug #65714 PHP cli forces the tty to cooked mode
...
Only drop the using_history() call with libedit as I don't know
if it is required with readline.
This also allow to run a php script in background without
it being aborted on first output.
2013-11-15 09:49:42 +01:00
Remi Collet
74ab30e216
fix merge
2013-11-13 13:21:12 +01:00
Remi Collet
018b9445da
Fix failed test with recent glibc
...
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See ddc7e412ab
So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string
Removing %Z from tested format gives the same behavior with all version.
2013-11-13 13:19:10 +01:00
Nikita Popov
dc4bf922d9
Allow $num=0 in array_fill()
...
Implemented request #49824 .
2013-11-12 22:02:51 +01:00
Andrea Faulds
91779db95b
Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-11 22:54:16 +00:00
Adam Harvey
1205a6c7dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:15:12 -05:00
Adam Harvey
304bff90f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:11:28 -05:00
Adam Harvey
288e9c6423
Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4
2013-11-10 15:43:56 -05:00
Remi Collet
6997b8793d
missing 'config.h' in 5dc37b3
2013-11-10 07:10:36 +01:00
Rasmus Lerdorf
6713f9c4b2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix broken test
2013-11-09 09:46:55 -08:00
Rasmus Lerdorf
df7321359e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix broken test
2013-11-09 09:46:43 -08:00
Rasmus Lerdorf
064ba179b1
Fix broken test
2013-11-09 09:45:52 -08:00
Dmitry Stogov
0e5c5072e6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
Conflicts:
NEWS
2013-11-08 16:36:31 +04:00
Dmitry Stogov
915c428ba1
Fixed issue #115 (path issue when using phar).
...
Fixed issue #149 (Phar mount points not working with OPcache enabled).
2013-11-08 16:35:05 +04:00
Dmitry Stogov
4e6a0bd5a9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added tests for PHAR/OPCahce incompatibilities
Update NEWS
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Update NEWS
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
NEWS entry
NEWS entry
Conflicts:
NEWS
2013-11-08 14:15:41 +04:00
Dmitry Stogov
49fbe2579e
Added tests for PHAR/OPCahce incompatibilities
2013-11-08 13:50:57 +04:00
Xinchen Hui
5f17c4d08e
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08 15:33:27 +08:00
Xinchen Hui
cf2626f10c
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
...
previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#
it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:
memset (ps,0,sizeof(*ps)); // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit
2013-11-08 15:32:28 +08:00
Xinchen Hui
41eb3c959d
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08 15:07:43 +08:00
Xinchen Hui
fd3fa9b53c
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
...
Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes
2013-11-08 15:06:36 +08:00
Rasmus Lerdorf
756dc19e59
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
2013-11-07 18:09:53 -08:00
Rasmus Lerdorf
b3d522d215
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
Conflicts:
ext/pdo/pdo_sql_parser.c
2013-11-07 18:09:15 -08:00
Rasmus Lerdorf
890ea8411f
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
2013-11-07 18:05:08 -08:00
Bob Weinand
152898ff28
Moved arrays again to "static_scalar:" & little cleanup
2013-11-07 16:39:47 +01:00
Dmitry Stogov
9647c61dc1
Constant expressions refactoring
2013-11-06 22:21:07 +04:00
Dmitry Stogov
af600c240d
Merge branch 'const_scalar_exprs' of github.com:bwoebi/php-src into const_scalar_exprs
...
* 'const_scalar_exprs' of github.com:bwoebi/php-src:
Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
Added a few more operators
Whitespace fix
converted several switches to ifs and made more opcache friendly
Fatal error about self referencing constants fixed
Fixed mem leaks, added tests and ternary operator
Working commit for constant scalar expressions (with constants). Tests will follow.
Conflicts:
Zend/Makefile.am
configure.in
win32/build/config.w32
2013-11-06 15:41:33 +04:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01:00
Sara Golemon
8b6b39fdcf
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-11-06 10:32:11 +01:00
ptarjan
290becb1f1
fix missing change from 'tcp_socket' to the more common 'server'
2013-11-06 10:32:00 +01:00
ptarjan
9c1e1bbc05
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Christopher Jones
c439ac6c35
Cleanup temp test file
2013-11-06 10:31:35 +01:00
Xinchen Hui
c76be5696d
Merge branch 'PHP-5.5'
...
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-06 17:01:24 +08:00
Xinchen Hui
9d75b9fb27
Revert "Fixed issue #115 (path issue when using phar)."
...
We need another better way to fix this
This reverts commit 098855433d
.
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-06 16:53:45 +08:00
Anatol Belski
c675980046
Merge branch 'pull-request/500'
...
* pull-request/500:
limit virtual_cwd_activate() duplicated call to ZTS only
reverted the previous commit, both calls are needed in TS mode
virtual_cwd_activate() should be called only in one place
back to do_alloca()
removed unnecessary call
simplify the state free macros
compact the code to preserve the error info after state freeing
back to do_alloca(), reverted the wrong replacement
enabled windows to use stack in both ts/nts mode, some more fixes
moved to do_alloca() usage where appropriate
fixed invalid free
fixed virtual cwd header in phar
updated NEWS
fixed all the places where last error could be lost
preserve the error code
applied and fixed the original patch
initial move on renaming files and fixing includes
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
Xinchen Hui
6c8ff0031c
Merge branch 'PHP-5.5'
...
Conflicts:
ext/phar/phar_internal.h
ext/phar/stream.c
ext/phar/util.c
2013-11-05 19:29:13 +08:00
Xinchen Hui
63dba7ec9d
Remove outdate codes, make it clearer, although just a bit..
2013-11-05 18:47:12 +08:00
Xinchen Hui
2a94494b7e
Merge branch 'PHP-5.5'
2013-11-05 11:09:08 +08:00
Xinchen Hui
d4f5ca467f
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
2013-11-05 11:08:09 +08:00
Xinchen Hui
e3d9e18e7b
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
...
I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable
2013-11-05 11:04:55 +08:00
Xinchen Hui
2b7e89e20a
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-11-05 11:03:47 +08:00
Remi Collet
5dc37b3510
Sync ext/zip with pecl/zip version 1.3.2
...
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
2013-11-04 13:23:36 +01:00
Xinchen Hui
2f555b8e60
Merge branch 'master' of git.php.net:php-src
2013-11-04 14:47:34 +08:00
Xinchen Hui
a07ae67a21
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-04 14:47:16 +08:00
Xinchen Hui
15eabbb436
Merge branch 'PHP-5.5'
2013-11-04 14:43:30 +08:00
Xinchen Hui
3d4ef50dd7
Fixed coredump due to abnormal implemention of phar
2013-11-04 14:42:54 +08:00
Bob Weinand
b45043a1b7
converted several switches to ifs and made more opcache friendly
2013-11-01 16:16:58 +01:00
Lior Kaplan
d3fd163d27
Typo fix: umknown -> unknown
2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f
Typo fix: umknown -> unknown
2013-10-31 22:59:42 +02:00
Bob Weinand
2361745806
Working commit for constant scalar expressions (with constants).
...
Tests will follow.
2013-10-31 08:57:12 +01:00
Sherif Ramadan
98c9e56ef0
Merge branch 'pull-request/287'
...
Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.
2013-10-30 09:36:19 -04:00
Nikita Popov
4218e89f8d
Fix bug #65997 by switching to Serializable for GMP
...
Rather than using get_properties and __wakeup for serialization
the code now uses Serializable::serialize() and
Serializable::unserialize(). The get_properties handler is switched
to a get_debug_info handler. Thus get_gc will now return only
the normal properties and not do any modifications, thus fixing
the leak. This also avoids a $num property from being publicly
visible after the object was dumped or serialized, so that's an
extra plus.
2013-10-29 20:58:30 +01:00
Nikita Popov
647e0be64b
Fix compile warning in GMP
2013-10-29 20:07:34 +01:00
Nikita Popov
82eca388d2
Fix ZTS build
2013-10-29 20:01:37 +01:00
Anatol Belski
e17de5e9fd
Merge branch 'bug50333' of github.com:weltling/php-src into bug50333
2013-10-29 17:15:40 +01:00
Yasuo Ohgaki
416f8fce5c
Implemented Change crypt() behavior w/o salt RFC
2013-10-29 18:53:45 +09:00
Yasuo Ohgaki
0d89265a69
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 17:38:22 +09:00
Yasuo Ohgaki
3cf2682083
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:30:58 +09:00
Yasuo Ohgaki
d04bcb8969
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:28:35 +09:00
Yasuo Ohgaki
4dc4302a30
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:24:23 +09:00
Remi Collet
141b77d97d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:58 +01:00
Remi Collet
a7fc8eecb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:44 +01:00
Remi Collet
e2c9f3983a
add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:24 +01:00
Derick Rethans
f626db130c
Merge branch 'PHP-5.5'
2013-10-28 15:12:38 +01:00
Derick Rethans
ad7793d94c
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-28 15:12:31 +01:00
Derick Rethans
ab6481993e
- Updated to version 2013.8 (2013h)
2013-10-28 15:12:30 +01:00
Derick Rethans
824bac9f23
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-10-28 15:09:13 +01:00
Derick Rethans
7a526f01b5
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-10-28 15:08:57 +01:00
Derick Rethans
8d8e8a43de
Merge branch 'master' of git.php.net:/php-src
2013-10-28 15:02:37 +01:00
Dmitry Stogov
ace2ee931c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Conflicts:
NEWS
2013-10-28 14:22:05 +04:00
Dmitry Stogov
eb22041ffe
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
2013-10-28 14:19:40 +04:00
Dmitry Stogov
1dcca1fdb9
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Conflicts:
NEWS
2013-10-28 13:50:04 +04:00
Dmitry Stogov
c6fb00e6d7
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:48:02 +04:00
Dmitry Stogov
b0f9768e02
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved performance of array_merge() by eliminating useless copying
Conflicts:
NEWS
2013-10-28 13:47:37 +04:00
Dmitry Stogov
5c0890ba8a
Improved performance of array_merge() by eliminating useless copying
2013-10-28 13:31:44 +04:00
Xinchen Hui
7fe370f9c7
Merge branch 'PHP-5.5'
2013-10-27 16:53:35 +08:00
Xinchen Hui
a3bd4fda09
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-27 16:53:13 +08:00
Xinchen Hui
9b399be778
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-10-27 16:53:05 +08:00
Xinchen Hui
e18e7a5983
remove "PHP 6" staff
2013-10-27 16:52:43 +08:00
Yasuo Ohgaki
37fb8e0c15
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:43:14 +09:00
Yasuo Ohgaki
bd1d2d8fb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:42:18 +09:00
Yasuo Ohgaki
e50eb1ce34
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:31:21 +09:00
Derick Rethans
20f7fcefdb
Merge branch 'PHP-5.5'
2013-10-23 22:33:59 +01:00
Derick Rethans
bb73d18c85
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-23 22:33:54 +01:00
Derick Rethans
9cb3a759a7
- Updated to version 2013.7 (2013g)
2013-10-23 22:33:53 +01:00
Xinchen Hui
5241cf7000
Merge branch 'PHP-5.5'
2013-10-23 19:27:48 +08:00
Xinchen Hui
0adba0abb9
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
2013-10-23 19:26:24 +08:00
Christopher Jones
e68c1ef2ec
Added a LICENSE file to make it easier for PECL binary distributions to conform with the license.
2013-10-22 11:03:09 -07:00
Yasuo Ohgaki
29e5a9659f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:30:24 +09:00
Yasuo Ohgaki
6af3683a4c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:29:01 +09:00
Yasuo Ohgaki
1f5b1cfb2b
Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:27:18 +09:00
Michael Wallner
cfd911473b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
2013-10-21 22:16:21 +02:00
Michael Wallner
757f4a952c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
2013-10-21 22:15:55 +02:00