clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 11:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,015 Commits 493 Branches 1,366 Tags 849 MiB
d756da8e72
Commit Graph

39974 Commits

Author SHA1 Message Date
Anatol Belski
c0ca731d7a add comment to test 2015-10-07 09:43:28 +02:00
Dmitry Stogov
91588a98be Fixed test (system error messages may be different). 2015-10-07 03:25:12 +03:00
Dmitry Stogov
abf3c2f796 Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck). 2015-10-07 03:08:11 +03:00
Dmitry Stogov
424a26d5d4 Split test into different versions for 32-bit and 64-bit systems 2015-10-07 01:51:37 +03:00
Nikita Popov
cd2b0a7bb8 Drop HAVE_PACKED_OBJECT_VALUE 
This check doesn't make sense anymore, we have no object_value
anymore.
 2015-10-06 23:12:34 +02:00
Nikita Popov
0a3c1fb4c2 More zpp cleanup in ext/intl 2015-10-06 22:58:02 +02:00
Dmitry Stogov
24e88348f3 Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src" 
This reverts commit a6be0f3fd6.
 2015-10-06 23:48:12 +03:00
Sara Golemon
a2082b7c97 Add some tests for unserialize() class filtering 2015-10-06 12:04:11 -07:00
Scott
63617a678f Fixed bug #70641 (Random_* - Better compatibility on Linux distros) 
See:
* https://bugs.php.net/bug.php?id=70641
* https://github.com/php/php-src/pull/1513#issuecomment-145571829
 2015-10-06 01:03:04 +02:00
Bob Weinand
a6be0f3fd6 Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src 2015-10-05 14:50:04 +02:00
Anatol Belski
a549a3ac17 improve error message 2015-10-04 16:36:53 +02:00
Anatol Belski
c97198e181 fix incrementing on 32-bit 2015-10-04 12:19:16 +02:00
Nuno Lopes
052dd3005b fix coverage report for datelib 2015-10-04 05:45:05 -04:00
Nuno Lopes
ba4a85b012 fix coverage report for datelib 2015-10-04 05:39:01 -04:00
Xinchen Hui
2fb8bb1157 Fixed bug #70632 (Third one of segfault in gc_remove_from_buffer) 2015-10-03 20:33:24 -07:00
Xinchen Hui
6876112c89 Fixed the third one of (segfault in gc_remove_from_buffer()) 
This one maybe only used in debug mode, so no bug report and no test
script provided
 2015-10-03 20:15:35 -07:00
Xinchen Hui
4744eec753 Fixed bug #70631 (Another Segfault in gc_remove_from_buffer()) 2015-10-03 20:08:21 -07:00
Xinchen Hui
925412ee1c Do not edit the zval cause it might be in shared memory 2015-10-03 19:50:38 -07:00
Xinchen Hui
c147d90dbf Fixed bug #70601 (Segfault in gc_remove_from_buffer()) 2015-10-03 19:38:56 -07:00
Anatol Belski
4cb6342426 remove useless checks 
Other platforms than listed in the checks are not supported since
PHP 5.5. We also won't need these checks for a while, so can simplify.
 2015-10-03 10:57:32 +02:00
Anatol Belski
96fe3be7f2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix win10 support
 2015-10-03 10:46:10 +02:00
Anatol Belski
83bef0ef83 fix win10 support 
dwMajorVersion == 10 there, and generally this check is obsolete
as we don't support dwMajorVersion < 6 since 5.5
 2015-10-03 10:44:43 +02:00
Nikita Popov
e892e2e253 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-03 10:13:44 +02:00
Nikita Popov
fe1933aae2 Fixed bug #70625 2015-10-03 10:12:11 +02:00
Derick Rethans
a2f5619303 Updated to version 2015.7 (2015g) 2015-10-02 18:12:18 +01:00
Derick Rethans
c08824fd72 Updated to version 2015.7 (2015g) 2015-10-02 18:12:16 +01:00
Xinchen Hui
c98ea8465b Fixed bug #70619 (DateTimeImmutable segfault) 2015-10-02 07:19:21 -07:00
Nikita Popov
1287c48082 Fix/improve zpp usage 
The ext/interbase changes are done blindly, fingers crossed.

Some of these are bug fixes, some make zpp usage more idiomatic.
 2015-10-02 09:35:00 +02:00
Antony Dovgal
99d5634079 fix dl() function 
..which was using old macro
 2015-09-30 14:40:29 +01:00
Julien Pauli
a60105d7a4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed test
  5.5.31 now
 2015-09-30 13:19:37 +02:00
Julien Pauli
0fd71d1184 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test
  5.5.31 now

Conflicts:
	configure.in
	main/php_version.h
 2015-09-30 13:19:18 +02:00
Julien Pauli
d7fb43e30d Fixed test 2015-09-30 13:18:16 +02:00
Anatol Belski
3e74df74f9 fix test 2015-09-30 12:18:32 +02:00
Andrey Hristov
07a8e5ce37 Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now). 2015-09-30 09:03:35 +02:00
Andrey Hristov
7b787ebbb6 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-30 09:04:00 +02:00
Anatol Belski
bfd2637068 fix test 2015-09-29 13:04:06 +02:00
marcosptf
dae3ab8e7a Update openssl_x509_checkpurpose.phpt 2015-09-29 10:41:24 +02:00
root
fc3580c9d5 add test to openssl ext 2015-09-29 10:41:22 +02:00
Dmitry Stogov
560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Scott
694b9af5b6 Remove makedev() check. 2015-09-29 09:14:30 +02:00
Scott
46aa628605 Different error message if makedev check fails 2015-09-29 09:14:29 +02:00
Scott
6554f721f7 Add support for getrandom(2), add type check on file descriptor 
Fix to_read, throw exception if syscall fails

Fixes thanks to feedback from sarnold at ##crypto on freenode

Correction on error conditions

Remove dead code (thanks @defuse)

It turns out getrandom can take >256, getentropy refuses.

Better semantics

Thanks @defuse for catching my silly mistake here

Cast to size_t to be explicit

Let's simplify the logic a bit

Let's be consistent; define everything before we do any logic

Continuously check that the file descriptor is still a valid one

Add device type check on fd initialization
 2015-09-29 09:14:28 +02:00
Anatol Belski
208ed0a010 fix test 
cutting out the '/' is not critical, but allows to avoid forking
 2015-09-29 09:11:52 +02:00
Stanislav Malyshev
d6e8426ebf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
	ext/phar/util.c
 2015-09-28 21:43:16 -07:00
Stanislav Malyshev
2e267bd3c7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 21:42:08 -07:00
Stanislav Malyshev
1ddf72180a Better fix for bug #70433 2015-09-28 21:41:02 -07:00
Stanislav Malyshev
4c6f4863fa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 20:45:02 -07:00
Stanislav Malyshev
51b23cd0f0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 20:44:28 -07:00
Stanislav Malyshev
f98ab19dc0 fix memory leak 2015-09-28 20:43:18 -07:00
Stanislav Malyshev
e78ac461db FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/" 2015-09-28 17:12:35 -07:00
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