Stanislav Malyshev
e7574a5329
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
Conflicts:
ext/phar/util.c
2015-09-28 17:00:32 -07:00
Stanislav Malyshev
f39a4ee0c9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 16:59:46 -07:00
Stanislav Malyshev
d698f0ae51
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 15:56:51 -07:00
Stanislav Malyshev
899753f240
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 13:08:44 -07:00
Stanislav Malyshev
629e4da7cc
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 11:31:14 -07:00
Andrey Hristov
be6546fac9
Add support for parameters to tick functions, on C level. This is only
...
for extensions that want to use register tick functions. Userland tick
functions are unaffected.
2015-09-28 11:21:17 +02:00
Andrey Hristov
7e3cd7cadf
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-25 14:29:06 +02:00
Andrey Hristov
59de2c037c
Fixed bug #70572 segfault in mysqlnd_connect
2015-09-25 14:06:28 +02:00
Anatol Belski
37c85ebb94
check for test requirement
2015-09-25 11:50:15 +02:00
Anatol Belski
c75346624a
fix data type and warning
2015-09-25 11:50:13 +02:00
Dmitry Stogov
a05fc48055
Extended zend_extension API to allow storing additional data associated with op_arrays in opcache SHM. (op_array->reserved[])
2015-09-25 11:50:38 +03:00
Dmitry Stogov
f509706318
Make necessary separation (it might be possible to fix this in a better way, but this will requre some refactoring)
2015-09-25 10:59:27 +03:00
Anatol Belski
67aff16d94
fix ident
2015-09-25 08:30:44 +02:00
Dmitry Stogov
c21d18ef95
Cleanup: avoid useless array duplication
2015-09-25 02:20:05 +03:00
Dmitry Stogov
01d5beddf4
Cleanup
2015-09-25 01:36:10 +03:00
Dmitry Stogov
ad4fa8f758
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-24 22:39:59 +03:00
Anatol Belski
0fd7acd11d
don't keep locked mutex after errors
2015-09-24 16:34:44 +02:00
Anatol Belski
df832c966c
avoid dangling pointers
2015-09-24 16:33:58 +02:00
Anatol Belski
3ef3d80f25
move accel_shared_globals assignment into locked block
...
this might fix crashes under high concurrency
2015-09-24 16:33:57 +02:00
Anatol Belski
a7552ca310
add ovfl check, fix warnings
2015-09-24 16:33:56 +02:00
Anatol Belski
807c29ed14
fix warning
2015-09-24 16:33:54 +02:00
Dmitry Stogov
415000ed93
Fixed bug #70573 (Cloning SplPriorityQueue leads to memory leaks)
2015-09-24 16:42:59 +03:00
Adam Harvey
6413ecb439
Fix a memory leak in sqlite3_do_callback.
...
This was very, very obvious when using a debug build of PHP to build the
manual!
Fixes bug #70571 (Memory leak in sqlite3_do_callback).
2015-09-24 14:16:45 +02:00
Dmitry Stogov
2d55e8c186
Fix (revert) loop exit condition
2015-09-24 11:19:26 +03:00
Dmitry Stogov
262160e0e9
Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken)
2015-09-24 10:48:34 +03:00
Dmitry Stogov
92708e3e04
Cleanup: avoid reallocations
2015-09-24 02:23:09 +03:00
Dmitry Stogov
57575c0898
Cleanup: avoid reallocations
2015-09-24 01:35:16 +03:00
Dmitry Stogov
5cccd6c5b6
Fixed memory leak and avoid reallocations
2015-09-24 01:19:15 +03:00
Dmitry Stogov
51cd49b2cf
Cleanup: replace removed condition with ZEND_ASSERT()
2015-09-24 00:25:51 +03:00
Anatol Belski
257693614e
add test
2015-09-23 19:48:38 +02:00
Anatol Belski
ca89d9a797
expose openssl config path so it can be tested
2015-09-23 19:48:20 +02:00
Andrey Hristov
003b764a49
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:38:29 +02:00
Andrey Hristov
f79cd18789
Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 18:25:12 +02:00
Anatol Belski
aba42e3dda
use bundled openssl.cnf
2015-09-23 17:14:59 +02:00
Bishop Bettini
368d3ff0d9
Bug #70561 : Fix DirectoryIterator to throw OutOfBoundsException
...
-------------------------------------------------------------------------------
DirectoryIterator implements SeekableIterator, which "should throw an
OutOfBoundsException if the position is not seekable". As is, seek just returns
and one must call valid(). This approach is different than most (all?) other
SeekableIterator implementations and leads to developer confusion. See the
bug report for a specific example.
2015-09-23 11:14:52 -04:00
Xinchen Hui
c87ef023aa
Fixed Bug #70558 ("Couldn't fetch" error in DOMDocument::registerNodeClass())
2015-09-23 07:01:50 -07:00
Anatol Belski
77b9acd326
add test
2015-09-23 14:17:04 +02:00
Anatol Belski
15d43095d7
expose openssl config path so it can be tested
2015-09-23 14:17:03 +02:00
Anatol Belski
8317e0fa46
add missing header
...
For PRIu32 and maybe more, that fixes build
2015-09-23 14:01:59 +02:00
Anatol Belski
c505d55158
silence mkdir to fix fails after unclean test run
2015-09-23 13:55:28 +02:00
Dmitry Stogov
d82ea930ed
Cleanup: removed deprecated commented code. Incorrect zval_dtor() usage replaced by zval_dtor_ptr().
2015-09-23 01:32:30 +03:00
Dmitry Stogov
95ac055fd3
Cleanup: zend_object_std_dtor() is called through free_obj handler
2015-09-23 00:12:31 +03:00
Dmitry Stogov
e2e99f16e1
Cleanup: removed deprecated commented code
2015-09-22 22:55:00 +03:00
Anatol Belski
a490485893
add test
2015-09-22 20:45:52 +02:00
Dmitry Stogov
e45f67245a
Cleanup: don't keep useless dangling pointer
2015-09-22 17:48:25 +03:00
Dmitry Stogov
e050412cdd
Cleanup: removed old commented code
2015-09-22 17:06:10 +03:00
Dmitry Stogov
c72559ddf6
Cleanup: removed deprecated commented code
2015-09-22 17:02:25 +03:00
Dmitry Stogov
a9bbe5c384
Make use of timelib 2015.02's support for external memory managers.
2015-09-22 09:17:50 +01:00
Derick Rethans
922f325c68
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-22 09:08:47 +01:00
Derick Rethans
96d1d13d87
Update timelib to 2015.02
2015-09-22 08:59:45 +01:00
Derick Rethans
dfc38fd0e4
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-22 08:45:33 +01:00
Derick Rethans
e4f3fb976b
Fixed test cases due to changes in rules
2015-09-22 08:42:12 +01:00
Derick Rethans
fab5cbab1a
Bumb timelib version to 2015.01
2015-09-22 08:41:56 +01:00
Xinchen Hui
b8ea991821
Fixed bug #70546 (ext/sysvshm: two broken tests on Solaris) by rainer.jung
2015-09-22 12:06:09 +08:00
Xinchen Hui
ed5a5bdff8
Fixed bug #70544 (ext/zip/tests/oo_addglob.phpt broken on Solaris)
2015-09-21 22:04:27 +08:00
Xinchen Hui
4febfc25a6
Use die
2015-09-20 09:34:28 -07:00
Xinchen Hui
3fc5f5cdb5
Fixed bug #70535 (XSLT: free(): invalid pointer)
2015-09-20 09:30:50 -07:00
Jakub Zelenka
6a81363405
Require at least OpenSSL version 0.9.8
2015-09-20 13:01:15 +01:00
Jakub Zelenka
76783a26d2
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-20 12:38:58 +01:00
Jakub Zelenka
dcd569aad6
Use tabs for arg info indent in openssl.c
2015-09-20 12:34:35 +01:00
Bob Weinand
509712c7d9
Add FAST_ZPP to various important stream funcs
2015-09-20 04:27:51 +02:00
Xinchen Hui
de6ee4c24f
Fixed bug #70526 (xmlrpc_set_type returns false on success)
2015-09-19 06:10:48 -07:00
Yasuo Ohgaki
2f7cc862d7
Fixed bug #70529 Session read causes "String is not zero-terminated" error
2015-09-19 11:26:14 +09:00
Edgar R. Sandi
d1d7890a87
adding test scenario to improve coverage
2015-09-18 12:09:38 -03:00
Xinchen Hui
d42d0460f8
RETURN_FALSE
2015-09-18 16:33:33 +08:00
Dmitry Stogov
6a3580fd56
Use Zend MM to keep statistic of non-persistent connections (calloc/free->pecalloc/pefree)
2015-09-18 10:36:09 +03:00
Matteo Beccati
cc875d1a25
Skip session_regenerate_id_cookie.phpt when there's no cgi
2015-09-18 07:51:46 +02:00
Dmitry Stogov
8fe171a3e0
Don't allocate memory for empty HashTables.
2015-09-17 19:17:10 +03:00
Yasuo Ohgaki
e341eb94cb
Add test for #70516 session_regenerate_id() does not send session ID cookie
2015-09-17 05:36:47 +09:00
Anatol Belski
0c7872f88a
add range check
2015-09-16 15:39:21 +02:00
Remi Collet
286b157a5f
fix regressio introduce in 22e23e7cb8
2015-09-16 14:32:05 +02:00
Xinchen Hui
066c05e51f
Suppressed warning about this function is not used
2015-09-15 08:54:14 -07:00
Xinchen Hui
e841016df7
Upgrade unicode_data.h to UnicodeData.txt 8.0.0 (part of bug #70475 ext/mbstring/unicode_data.h needs update)
2015-09-15 07:56:10 -07:00
Christopher Jones
e0193a0bef
Improve row fetch changes for PHP7. Update test SKIPIFs. Add test for 11g client (Senthil)
2015-09-15 12:03:24 +10:00
Dmitry Stogov
233c42ad59
Enabled placing PHP code segment into huge pages
2015-09-15 02:04:09 +03:00
Dmitry Stogov
818e5ea5f7
Enable file based cache compilation by default
2015-09-15 01:58:32 +03:00
Dmitry Stogov
c104d329e1
Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default.
2015-09-15 01:54:04 +03:00
Dmitry Stogov
f2480582fb
Removed useless include
2015-09-15 01:46:53 +03:00
Dmitry Stogov
927d68db24
Avoid reallocations
2015-09-14 23:04:27 +03:00
Dmitry Stogov
5c28c21159
Use memcpy() instead of mmap() to keep modifyed code (e.g. gdb breakpoints)
2015-09-14 18:42:45 +03:00
Nikita Popov
ab74d80247
Fix bug #70487
...
Switch to * instead of + in zpp.
2015-09-14 15:04:43 +02:00
Dmitry Stogov
669f0b39b1
Added an experemental ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
...
PHP should be configured and built with --enable-huge-code-pages, OS should be configured to provide huge pages.
It's possible to enable/disable this future in php.ini through opcache.enable_huge_code_pages=0/1.
The feature was tested on Linux and provided 2% improvement on real-life apps, because of 2-3 times reduction in number of iTLB misses.
2015-09-14 13:34:17 +03:00
Christopher Jones
145708b658
Fix mem leak in PHP7
2015-09-14 13:29:09 +10:00
Bob Weinand
fe08b933e4
Add support for **= in opcache optimizer
2015-09-13 12:35:35 +02:00
Anatol Belski
969dcf7b61
add overflow check
2015-09-12 18:57:23 +02:00
Anatol Belski
5d035b57ee
fix data types
2015-09-12 18:53:30 +02:00
Anatol Belski
c6ff5be09d
add range checks
2015-09-12 10:29:00 +02:00
Christopher Jones
a96f99e30a
Final diff fixes for PHP7 on base platform (some mem leaks still to be fixed). Update driver name. Improve test portability (Senthil)
2015-09-12 09:10:32 +10:00
Dmitry Stogov
719664dec2
fixed compilation error
2015-09-10 20:24:11 +03:00
Xinchen Hui
bb4c0c0703
Merge branch 'PHP-5.6'
2015-09-10 19:56:18 +08:00
Dmitry Stogov
27f6b8864e
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Aligned IntlChar protos to their ARG_INFO (related to #70453 )
Skip IntlChar related test if ext/intl is not available
2015-09-10 02:53:57 +03:00
Dmitry Stogov
c174e4cd73
Change array sorting implementation to avoid two level callbacks system.
...
Simplify zval comparion API.
2015-09-10 02:51:23 +03:00
Christoph M. Becker
46c20ecf0a
Aligned IntlChar protos to their ARG_INFO (related to #70453 )
2015-09-10 01:38:15 +02:00
Christoph M. Becker
31962306f4
Skip IntlChar related test if ext/intl is not available
2015-09-10 01:31:55 +02:00
Côme Bernigaud
059dd18c37
Added support of LDAP_OPT_TIMEOUT, fixes #69574
2015-09-09 18:02:10 +02:00
Dmitry Stogov
2ea18cd431
Better array_compare improvement
2015-09-09 15:11:03 +03:00
Xinchen Hui
6d885e395c
Merge branch 'master' of git.php.net:/php-src
2015-09-09 18:02:27 +08:00
Xinchen Hui
59e8eae4b0
Useless ZVAL_UNDEF
2015-09-09 18:00:04 +08:00
Xinchen Hui
67d1a47887
Improved array_compare
2015-09-09 17:56:44 +08:00
Côme Bernigaud
fb9d934d51
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 11:05:29 +02:00
Côme Bernigaud
a483a79c85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:34:46 +02:00
Xinchen Hui
b00a315806
Unused var
2015-09-09 15:15:43 +08:00
Christoph M. Becker
502b70c50c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Skip test for old glibc iconv
2015-09-09 04:33:28 +02:00
Christoph M. Becker
71da4f1f7f
Skip test for old glibc iconv
...
bug32001.phpt has a high failure rate for the submitted reports. According to
several samples it seems the iconv implementation of glibc 2.12 (released
2010-05) is the culprit. It seems appropriate to skip the test for such old
versions.
2015-09-09 04:27:28 +02:00
Nikita Popov
7c8798834a
Small cleanup in pack() implementation
2015-09-09 03:58:37 +02:00
Tyson Andre
c3fc65eb7c
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
...
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.
This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
2015-09-08 18:42:02 -07:00
Christoph M. Becker
71f90dfbad
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70456 : mysqlnd doesn't activate TCP keep-alive when connecting to a server
Resolved conflicts:
ext/mysqlnd/mysqlnd_net.c
2015-09-09 03:19:55 +02:00
Sergei Turchanov
7b3616db77
Fix #70456 : mysqlnd doesn't activate TCP keep-alive when connecting to a server
...
libmysqlclient activates TCP keep-alive when connecting to a server. PHP
mysqlnd extension must do the same to maintain compatibility.
2015-09-09 01:43:29 +02:00
Bob Weinand
c12917aa45
Merged RFC Random Functions Throwing Exceptions in PHP 7
...
Squashes commits from PR #1397
commit cd5dcc8c9eb43603d908abcea69c9e18df0f2ed5
Author: SammyK <sammyk@sammykmedia.com>
Date: Tue Sep 8 13:53:42 2015 -0500
Add min max samezies
commit b719499218a4e84efecd4dc1d4235d16142c9793
Author: SammyK <sammyk@sammykmedia.com>
Date: Wed Sep 2 07:00:25 2015 -0500
Make random_bytes() throw Error when $length <= 0 and random_int() throw Error when $min > $max
commit 0cca557291c278716ec4b00b32fc2bdc1c1c8848
Author: SammyK <sammyk@sammykmedia.com>
Date: Wed Sep 2 06:55:59 2015 -0500
Make random_*() functions throw Error exception when random bytes cannot be obtained
commit 998c7f1e209123605b41139e8d9093075ce16bd6
Author: SammyK <sammyk@sammykmedia.com>
Date: Wed Sep 2 06:41:20 2015 -0500
Make random_*() functions throw TypeError when zend_parse_parameters fails
commit 99d305c18820ff55d82d952777cbcdf1cf0158be
Author: SammyK <sammyk@sammykmedia.com>
Date: Mon Jul 6 19:50:47 2015 -0500
Make exceptions less specific
commit b042dfab290713366741a663a420cf12bf802f39
Author: SammyK <sammyk@sammykmedia.com>
Date: Mon Jul 6 17:20:13 2015 -0500
Upgrade warnings to RuntimeExceptions
2015-09-09 01:00:29 +02:00
Daniel Persson
e7414a48ef
Changed from testing cast-128 to cast-256
2015-09-08 23:01:09 +02:00
Yasuo Ohgaki
3bf9bd5e92
Fix typo in comment.
2015-09-08 18:52:31 +09:00
Yasuo Ohgaki
f4c9deb452
Add URL rewrite issue note.
2015-09-08 18:50:40 +09:00
Yasuo Ohgaki
ab0e347f26
Add more test cases
2015-09-08 18:44:23 +09:00
Christoph M. Becker
1c902e2e63
Fix #70454 : IntlChar::forDigit second parameter should be optional
...
ZPP expects "ll" instead of "l|l" what would match the "proto" and the
ARG_INFO.
2015-09-07 23:46:12 +02:00
Christoph M. Becker
1372909429
Fix #70453 : IntlChar::foldCase() incorrect arguments and missing constants
...
We add missing ARG_INFO for the seconds parameter $options, and add the
respective constants IntlChar::FOLD_CASE_DEFAULT and
::FOLD_CASE_EXCLUDE_SPECIAL_I.
2015-09-07 23:02:56 +02:00
Anatol Belski
b9155b851e
add test for bug #70423
2015-09-07 17:31:49 +02:00
Anatol Belski
46792a9914
remove unnecessary check
...
as it's unrelated to the size pre calculation
2015-09-07 15:14:26 +02:00
Anatol Belski
eaf96698c7
Fix bug #70423 Warning Internal error: wrong size calculation
2015-09-07 15:02:33 +02:00
Remi Collet
db99b877f0
ext/zip version is now 1.13.0
2015-09-07 14:04:20 +02:00
Remi Collet
a5d6cf788e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix build
2015-09-07 13:55:19 +02:00
Remi Collet
debfc866d2
Fix build
...
php_zip.c:1647:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
php_zip.c:1648:3: error: format not a string literal and no format arguments [-Werror=format-security]
2015-09-07 13:52:28 +02:00
Ondřej Surý
82c0156cac
Include config.h instead of php_config.h in gd_compat.c to have the configure variable available in outside-of-the-tree module build
2015-09-07 13:28:05 +02:00
Yasuo Ohgaki
aa352a34fd
Make sure closing save handler.
2015-09-07 04:55:08 +09:00
Yasuo Ohgaki
f34b858ed0
Fix #70013 : Reference to $_SESSION is lost after a call to session_regenerate_id()
2015-09-07 03:57:03 +09:00
Jakub Zelenka
e235cb65fb
Fix request #70438 : Add IV parameter for openssl_seal and openssl_open
2015-09-06 19:09:56 +01:00
Jakub Zelenka
473ccf47a5
Merge branch 'PHP-5.6'
2015-09-06 16:42:37 +01:00
Jakub Zelenka
d47029167d
Fix bug #60632 : openssl_seal fails with AES
2015-09-06 16:39:59 +01:00
Christoph M. Becker
1b344f55f4
Revert "Fix #70029 : nodeValue of DOMElement list content of children nodes"
...
This reverts commit 25a52d98d7
.
2015-09-06 15:36:43 +02:00
Christoph M. Becker
28e82cc714
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70395 : Missing ARG_INFO for openssl_seal()
2015-09-05 03:19:43 +02:00
Christoph M. Becker
43b26c7b21
Fix #70395 : Missing ARG_INFO for openssl_seal()
...
This patch adds the missing ARG_INFO for the optional 5th parameter $method.
2015-09-05 03:08:02 +02:00
Christoph M. Becker
25a52d98d7
Fix #70029 : nodeValue of DOMElement list content of children nodes
...
According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is
supposed to yield null, but currently the DOM extension yield the result of
calling xmlNodeGetContent(), what is the concatenation of the values of the
children of the element. This patch fixes the non standard behavior.
2015-09-05 01:52:41 +02:00
Christoph M. Becker
c9a8733ce2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
Resolved conflicts:
ext/dom/node.c
2015-09-05 01:32:08 +02:00
Christoph M. Becker
b2954c64ab
Fix #70001 : Assigning to DOMNode::textContent does additional entity encoding
...
Assigning to DOMNode::textContent encodes entities, what does not match the
behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch
changes the behavior of DOMNode::textContent in this regard.
2015-09-05 01:17:50 +02:00
Christoph M. Becker
0836d6484c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70322 : ZipArchive::close() doesn't indicate errors
2015-09-05 00:43:41 +02:00
Christoph M. Becker
c77f783777
Fix #70322 : ZipArchive::close() doesn't indicate errors
...
If an archive can't be written, ZipArchive::close() nonetheless returns TRUE.
We fix the return value to properly return success, and additionally raise a
warning on failure.
2015-09-05 00:34:10 +02:00
Jakub Zelenka
539db00538
Simplify JSON constants registration
2015-09-04 20:00:29 +01:00
Jakub Zelenka
6e5574807f
Add my name to authors for previous refactoring
...
Related to jsond changes
2015-09-04 19:56:59 +01:00
Jakub Zelenka
7fe2646be3
Move json_decode options macros bellow encode options
2015-09-04 19:37:12 +01:00
Ryan McCullagh
45fdff1c85
json: fix formating of PHP_JSON* option bitshifts
2015-09-04 19:29:54 +01:00
Kalle Sommer Nielsen
fbfceaaa5d
Merge branch 'pull-request/1497'
2015-09-04 17:59:06 +02:00
Kalle Sommer Nielsen
4481be5d26
Fix build on Windows
2015-09-04 17:49:48 +02:00
Bob Weinand
3d05785054
Merge remote-tracking branch 'origin/PHP-5.6'
2015-09-04 16:35:15 +02:00
Niklas Keller
4b1dff6f43
Fix #70361 : HTTP stream wrapper doesn't close keep-alive connections
2015-09-04 16:29:35 +02:00
Márcio Almada
c08b3922dd
adds missing tokens to list of semi-reserved words and regenerates test suite
2015-09-04 15:02:50 +02:00
Joe Watkins
26e619b192
these need to be exported for extensions that use json
2015-09-03 19:28:34 +01:00
Lior Kaplan
9131cf4924
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
2015-09-03 18:46:07 +03:00
Xinchen Hui
49ee37d870
Seems master is not affected
2015-09-02 23:15:57 -07:00
Xinchen Hui
6290344d96
Fixed test
2015-09-02 21:59:36 -07:00
Levi Morrison
432dc527ad
Partially fix bug #67167 - Wrong return value...
...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE
The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
2015-09-02 18:23:26 -06:00
Levi Morrison
730496b899
Skip if ext/filter isn't loaded
2015-09-02 10:12:08 -06:00
Julien Pauli
bb98ed600a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Merge branch 'PHP-5.6'
bump version
Conflicts:
configure.in
main/php_version.h
2015-09-02 17:55:20 +02:00
Matteo Beccati
a12cef979d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added missing skipif for phar+zlib test
2015-09-02 17:53:36 +02:00
Julien Pauli
60e2207c34
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.30 next
More fixes for bug #70219
Conflicts:
ext/pcre/php_pcre.c
ext/session/session.c
2015-09-02 17:51:02 +02:00
Anatol Belski
ebb6f5eae6
fix dir separators in test
2015-09-02 17:26:35 +02:00
Anatol Belski
2d72a17ab9
use correct api
2015-09-02 17:25:00 +02:00
Anatol Belski
45a72785b5
fix leak
2015-09-02 17:20:24 +02:00
Dmitry Stogov
a2f8a7675b
Prevent HashTable compaction below HT_MIN_SIZE (this may lead to hash collisions).
2015-09-02 13:03:31 +03:00
Stanislav Malyshev
9c35f87e9a
Temporary add XFAILs, will fix soon
2015-09-02 01:23:40 -07:00
Stanislav Malyshev
6640aded24
fix memory leak
2015-09-02 01:21:47 -07:00
Stanislav Malyshev
c18f662e3c
Merge remote-tracking branch 'origin/master'
...
* origin/master:
Add test for ReflectionMethod::getPrototype_basic()
Added two tests to check the main functionallity of recode extension
Doubles are not refcounted
Fix #32490 : constructor of mysqli has wrong name
2015-09-02 01:00:16 -07:00
Stanislav Malyshev
9b1a224d4e
Merge branch 'PHP-5.6'
...
* PHP-5.6: (21 commits)
fix unit tests
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
...
Conflicts:
ext/exif/exif.c
ext/gmp/gmp.c
ext/pcre/php_pcre.c
ext/session/session.c
ext/session/tests/session_decode_variation3.phpt
ext/soap/soap.c
ext/spl/spl_observer.c
ext/standard/var.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xsl/xsltprocessor.c
2015-09-02 00:37:20 -07:00
Davey Shafik
9ec6a44c5e
Add CURLPIPE_* constants to properly expose HTTP/2 multiplexing
2015-09-02 17:16:43 +12:00
marcosptf
519016096f
Add test for ReflectionMethod::getPrototype_basic()
2015-09-02 00:28:46 +02:00
Daniel Persson
c98b88aafe
Added two tests to check the main functionallity of recode extension
2015-09-02 00:11:45 +02:00
Stanislav Malyshev
a6c063d663
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
More fixes for bug #70219
2015-09-01 12:51:48 -07:00
Christoph M. Becker
b15eff6386
Fix #32490 : constructor of mysqli has wrong name
...
As of PHP 7 old style constructor names are deprecated, so we rename
mysqli::mysqli() to mysqli::__construct().
2015-09-01 21:44:16 +02:00
Stanislav Malyshev
3fe509443c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix unit tests
2015-09-01 12:24:14 -07:00
Stanislav Malyshev
43c2dfa7b3
Merge branch 'PHP-5.5' into PHP-5.5.29
...
* PHP-5.5:
fix unit tests
2015-09-01 12:24:06 -07:00
Stanislav Malyshev
4aeff30337
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix unit tests
2015-09-01 12:23:55 -07:00
Stanislav Malyshev
1922c650ba
fix unit tests
2015-09-01 12:23:22 -07:00
Stanislav Malyshev
c19d59c550
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
5.4.45 next
Conflicts:
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/zip/php_zip.c
2015-09-01 12:06:41 -07:00
Stanislav Malyshev
45e7e79485
Merge branch '70284' into PHP-5.6
...
* 70284:
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
2015-09-01 12:05:02 -07:00
Stanislav Malyshev
53d274beb0
Merge branch 'PHP-5.5' into PHP-5.5.29
...
* PHP-5.5:
Improve fix for #70172
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
Conflicts:
ext/pcre/php_pcre.c
2015-09-01 11:43:27 -07:00
Stanislav Malyshev
33d3acaae7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
5.4.45 next
Conflicts:
configure.in
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h
2015-09-01 11:42:19 -07:00
Stanislav Malyshev
7c31203935
Improve fix for #70172
2015-09-01 11:38:39 -07:00
Dmitry Stogov
d8eee72a84
Fixed possible caching with invalid key value
2015-09-01 12:56:33 +03:00
Stanislav Malyshev
e2291e4b1a
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
2015-09-01 01:17:12 -07:00
Stanislav Malyshev
1390a5812b
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
2015-09-01 01:16:30 -07:00
Stanislav Malyshev
3605d1baf5
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
fix test
2015-09-01 00:59:55 -07:00
Stanislav Malyshev
906f19f136
fix test
2015-09-01 00:59:31 -07:00
Dmitry Stogov
bb4b50636c
Fixed one more problem related to bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
2015-09-01 10:39:00 +03:00
Stanislav Malyshev
6935058a98
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Conflicts:
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
2015-09-01 00:28:39 -07:00
Stanislav Malyshev
c8f07ad477
add test
2015-09-01 00:26:12 -07:00
Stanislav Malyshev
259057b2a4
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
2015-09-01 00:20:45 -07:00
Stanislav Malyshev
f06a069c46
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
2015-09-01 00:14:15 -07:00
Stanislav Malyshev
e8429400d4
Fix bug #70172 - Use After Free Vulnerability in unserialize()
2015-08-31 23:26:14 -07:00
Stanislav Malyshev
e201f01ac1
Fix bug #70388 - SOAP serialize_function_call() type confusion
2015-08-31 21:06:03 -07:00
Dmitry Stogov
89aa1b7392
Ensure proper data alignment
2015-08-31 13:56:42 +03:00
Xinchen Hui
9da99d8c5f
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-08-30 05:34:15 -07:00
Xinchen Hui
014abbc840
Merge branch 'PHP-5.6'
...
Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/php_pdo_driver.h
2015-08-30 05:32:37 -07:00
Xinchen Hui
ef1bd8f0e6
Fixed bug #70389 (PDO constructor changes unrelated variables)
2015-08-30 05:02:38 -07:00
Stanislav Malyshev
f9c2bf73ad
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
2015-08-30 00:38:08 -07:00
Stanislav Malyshev
ce2c67c8e8
Improve fix for #70385
2015-08-29 23:01:36 -07:00
Matteo Beccati
cb5582d3c1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added missing skipif for phar+zlib test
2015-08-29 10:48:53 +02:00
Matteo Beccati
9d816f1bcf
Added missing skipif for phar+zlib test
2015-08-29 10:47:02 +02:00
Matteo Beccati
6b3e44369d
Fixed bug #70386 Can't compile on NetBSD because of missing WCONTINUED
...
since 90114a3e93
2015-08-29 08:07:45 +02:00
Stanislav Malyshev
03964892c0
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
2015-08-28 22:52:50 -07:00
Stanislav Malyshev
64043cb9e5
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
2015-08-28 22:25:41 -07:00
Stanislav Malyshev
fc8eff897b
More fixes for bug #70219
2015-08-28 21:50:21 -07:00
Anatol Belski
00eebd7a47
fix dir separator in test
2015-08-28 11:39:26 +02:00
Anatol Belski
5d2294e8b8
fix path separator in test
2015-08-28 11:38:16 +02:00
Anatol Belski
ebdd9cf6e8
fix test
2015-08-28 11:29:38 +02:00
Jakub Zelenka
6b9f31ab74
Merge branch 'PHP-5.6'
2015-08-27 20:17:33 +01:00
Jakub Zelenka
ad028ebc11
Use new range checks in openssl ext
2015-08-26 19:55:29 +01:00
Anatol Belski
150dead2d9
add range check to ext/soap
2015-08-26 16:39:54 +02:00
Anatol Belski
1553ce2093
add some range checks to pcre
2015-08-26 16:39:53 +02:00
Anatol Belski
ce3e3f7884
more range checks in ext/tidy
2015-08-26 16:39:52 +02:00
Anatol Belski
871acceace
add range checks to ext/tidy
2015-08-26 16:39:51 +02:00
Anatol Belski
201afce875
add some range checks to ext/dom
2015-08-26 16:39:50 +02:00
Anatol Belski
a3dceb485a
fix test
2015-08-26 16:39:48 +02:00
Anatol Belski
2c523f21c9
add range checks to simplexml
2015-08-26 16:39:47 +02:00
Dmitry Stogov
1f0f768e3f
Avoid duplication
2015-08-26 14:53:41 +03:00
Christopher Jones
a52902faf4
Squash some more PHP 7 diffs and improve test portability (Senthil)
2015-08-26 21:22:58 +10:00
Stanislav Malyshev
24dda816d0
Merge branch 'PHP-5.4.45' into PHP-5.5.29
...
* PHP-5.4.45:
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
5.4.45 next
Conflicts:
configure.in
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h
2015-08-25 23:08:49 -07:00
Dmitry Stogov
25f9e25526
Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
2015-08-26 03:27:05 +03:00
Jakub Zelenka
c39336d1d8
Fix bug #55259 (openssl extension does not get the DH parameters from DH key resource)
2015-08-25 20:26:11 +01:00
Christoph M. Becker
2455ab2a2b
Remove superfluous forward declaration
...
mysqli_get_cache_stats() has been removed with commit f9ad56e; we're finally
getting rid of its remaining forward declaration.
2015-08-25 14:26:55 +02:00
Christoph M. Becker
405f8b5c91
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #67131 : setcookie() conditional for empty values not met
Resolved conflicts:
ext/standard/head.c
2015-08-24 23:11:03 +02:00
Christoph M. Becker
fc203fa37e
Fix #67131 : setcookie() conditional for empty values not met
...
PHP applies a workaround for old MSIE where setting an empty cookie value would
not delete the cookie. This workaround is only triggered if an empty string (or
a value that converts to an empty string) is actually given as $value parameter
of setcookie. If the $value parameter is omitted, an empty cookie value is
sent. This commit fixes the inconsistent behavior.
2015-08-24 23:03:50 +02:00
Ferenc Kovacs
95a0b11d0a
fixup, both catched by nikic
2015-08-24 17:02:25 +02:00
Xinchen Hui
fd5e0dc3c6
Fixed bug #70342 (changing configuration with ignore_user_abort(true) isn't working)
2015-08-24 21:09:16 +08:00
Ferenc Kovacs
e93d7953df
use another character device in this test as /dev/console seems that it is different for lxc containers
2015-08-24 14:40:21 +02:00
Ferenc Kovacs
941bbf2067
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
2015-08-24 14:40:06 +02:00
Stanislav Malyshev
df4bf28f9f
Fix bug #70219 (Use after free vulnerability in session deserializer)
2015-08-23 19:56:12 -07:00
Stanislav Malyshev
d735957cb5
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
2015-08-23 16:08:07 -07:00
marcosptf
d536ecac5c
added test for gzgetss()
2015-08-23 17:55:23 +02:00
Anatol Belski
78b2b1d6f7
fix test
...
backport from master
2015-08-23 17:27:55 +02:00
Anatol Belski
b460b530d6
fix test
...
backport from master
2015-08-23 17:27:53 +02:00
Anatol Belski
24e78ec1d8
fix test
2015-08-23 17:27:51 +02:00
Anatol Belski
5786f86656
fix test
...
backported from master
2015-08-23 17:27:50 +02:00
Xinchen Hui
4df6f26442
Fixed bug #70330 (Segmentation Fault with multiple "curl_copy_handle")
2015-08-23 13:01:47 +08:00
Anatol Belski
f9ae74a4c0
make this test Windows only
...
as we're not in control of the libxml builds everywhere
2015-08-21 19:47:17 +02:00
Anatol Belski
2b9c7f881a
fix tests
2015-08-21 15:13:39 +02:00
Anatol Belski
aa23bc6d1d
fix dir separator
2015-08-21 14:08:33 +02:00
Anatol Belski
9e69ef4ce2
fix dir separator in test
2015-08-21 14:05:58 +02:00
Anatol Belski
e8f37fe3dc
fix dir separator in test
2015-08-21 14:04:08 +02:00
Xinchen Hui
5a37056efa
unnecessary 1 byte allocted
2015-08-21 18:28:02 +08:00
Anatol Belski
13044447eb
add test for bug 70309
2015-08-21 11:47:00 +02:00
Bob Weinand
5ece3ec71c
Fix bogus traces with ReflectionGenerator::getTrace()
2015-08-20 23:24:28 +02:00
Jakub Zelenka
7ad1703413
Add overflow check for openssl_pkcs12_read
2015-08-20 19:29:54 +01:00
Anatol Belski
4ad0714d76
fork test
2015-08-20 13:32:29 +02:00
Christopher Jones
af76506830
Fixed bug #70308 (PDO::ATTR_PREFETCH is ignored)
2015-08-20 14:09:30 +10:00
Christoph M. Becker
7373da78fe
Merge branch 'pull-request/1471'
...
* pull-request/1471:
add test for php_enchant_broker_free()
2015-08-19 22:27:39 +02:00
marcosptf
bf340ec417
add test for php_enchant_broker_free()
2015-08-19 22:25:29 +02:00
Christoph M. Becker
8e9e1b7da3
Merge branch 'pull-request/1472'
...
* pull-request/1472:
This is a new test for enchant_broker_free_dict(). This function never was covered by .phpt
2015-08-19 22:16:42 +02:00
marcosptf
d085100a52
This is a new test for enchant_broker_free_dict().
...
This function never was covered by .phpt
2015-08-19 22:15:40 +02:00
Christoph M. Becker
533c11386f
Merge branch 'pull-request/1475'
...
* pull-request/1475:
testing enchant_broker_(g|s)et_dict_path
2015-08-19 21:59:40 +02:00
marcosptf
9a4b0dbe40
testing enchant_broker_(g|s)et_dict_path
2015-08-19 21:57:42 +02:00
Jakub Zelenka
c3f0c87564
Add overflow checks for openssl_pkey_* functions
2015-08-19 20:10:14 +01:00
Jakub Zelenka
478ecc674b
Move overflow checks in openssl_pbkdf2
2015-08-19 20:06:58 +01:00