php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,015 Commits 547 Branches 1,483 Tags
314ef0ff69f2b88c3eaa8c9abd7610e09fa50d89
Commit Graph

43960 Commits

Author SHA1 Message Date
Nikita Popov
314ef0ff69 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-09 17:32:01 +01:00
Thomas Orozco
247ce052cd Fixed bug #71003: Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT 2017-03-09 17:31:21 +01:00
Nikita Popov
6635639b75 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-09 16:45:28 +01:00
mcq8
b224e74267 Fixed bug #72096 Swatch time value incorrect for dates before 1970 2017-03-09 16:44:02 +01:00
andrewnester
8f799137d7 Fixed bug #74058 
Fall back from get_property_ptr_ptr to read_property if offsetGet
is overridden.
 2017-03-09 00:10:00 +01:00
Sara Golemon
1a19b97ac3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Detect invalid port in xp_socket parse ip address
 2017-03-07 12:11:22 -08:00
Sara Golemon
bab0b99f37 Detect invalid port in xp_socket parse ip address 
For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)

However, with the introdcution of stream transports in PHP 4.3,
it became possible to include the port in the hostname specifier:

fsockopen('127.0.0.1:80')
Or more formally: fsockopen('tcp://127.0.0.1:80')

Confusing results when these two forms are combined, however.
fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting
to connect to '127.0.0.1:80:443' which any reasonable stack would
consider invalid.

Unfortunately, PHP parses the address looking for the first colon
(with special handling for IPv6, don't worry) and calls atoi()
from there.  atoi() in turn, simply stops parsing at the first
non-numeric character and returns the value so far.

The end result is that the explicitly supplied port is treated
as ignored garbage, rather than producing an error.

This diff replaces atoi() with strtol() and inspects the
stop character.  If additional "garbage" of any kind is found,
it fails and returns an error.
 2017-03-07 12:10:53 -08:00
Dmitry Stogov
d9231b1667 Fixed pointer allignment 2017-03-07 10:18:34 +03:00
Dmitry Stogov
b273a8cbe4 Ensure pointer alignment. 2017-03-07 09:48:18 +03:00
Dmitry Stogov
6158b517c4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
 2017-03-03 16:12:41 +03:00
Dmitry Stogov
648b756f35 Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt) 2017-03-03 16:10:46 +03:00
Nikita Popov
bf8c463f5b Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 12:36:13 +01:00
somedaysummer
fab5ce347c PHP bug #74004 
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.
 2017-03-02 12:35:42 +01:00
Derick Rethans
a7ff583e7e Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 11:28:09 +00:00
Derick Rethans
cf60f26da6 Fixed tests after tzdb removed abbreviations 2017-03-02 11:28:02 +00:00
Derick Rethans
61e9b7354f Make sure we anchor this test to February 2017-03-02 11:27:44 +00:00
Nikita Popov
bc1807dbe2 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 12:13:38 +01:00
Mitch Hagstrand
29333550d2 Fix bug73858.phpt to work in months without 31 days 
Used hardcoded months in bug73858.phpt rather than the current and previous
month.
 2017-03-02 12:13:06 +01:00
Christopher Jones
06e5ec9e32 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 15:33:25 +11:00
Christopher Jones
e80ea04c79 Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated) 
This was a modification of an incomplete PR #2276.
 2017-03-02 15:28:01 +11:00
Derick Rethans
1b16fb594f Updated to version 2017.1 (2017a) 2017-03-01 20:07:51 +00:00
Derick Rethans
dfcb11d7d1 Updated to version 2017.1 (2017a) 2017-03-01 20:07:51 +00:00
Remi Collet
2f955d5d0a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  make type consistent with glob_t.gl_pathc
 2017-03-01 17:02:42 +01:00
Remi Collet
53a08fd07d make type consistent with glob_t.gl_pathc 2017-03-01 17:01:58 +01:00
Nikita Popov
f678b0eae2 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-24 23:22:24 +01:00
Grundik
eac8166bd4 Fix bug #73127 
gost-crypto hash was incorrect if input data contained long 0xFF
sequence, due to a carry-propagation bug.
 2017-02-24 23:20:49 +01:00
Aaron Piotrowski
531fbb88f5 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 22:56:04 -06:00
Aaron Piotrowski
ff8a6b1232 Update test for bug #74159 2017-02-23 22:24:59 -06:00
Aaron Piotrowski
c05c65ac80 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 21:19:46 -06:00
Aaron Piotrowski
e9873d9853 Fix bug #74159 
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
 2017-02-23 20:59:43 -06:00
Xinchen Hui
be60d159b6 Add test only (bug doesn't exists in 7.1) 2017-02-23 12:47:15 +08:00
Xinchen Hui
330a7b62c3 Fixed bug #74152 (if statement says true to a null variable) 2017-02-23 12:33:17 +08:00
Xinchen Hui
48fcc5ddc2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
 2017-02-23 11:02:37 +08:00
Xinchen Hui
1d4eead995 Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments) 2017-02-23 11:02:23 +08:00
Dmitry Stogov
500232ef35 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  too many dashes
 2017-02-21 10:48:21 +03:00
Dmitry Stogov
593a4d8fe9 too many dashes 2017-02-21 10:47:48 +03:00
Dmitry Stogov
508d78ce5e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) Include WSDL cache version number into file name
 2017-02-21 10:42:42 +03:00
Dmitry Stogov
bd7e5c1548 Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) 
Include WSDL cache version number into file name
 2017-02-21 10:41:20 +03:00
Remi Collet
dd9701c414 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test for libzip 1.2.0
 2017-02-19 17:02:16 +01:00
Remi Collet
c836ad1c7e fix test for libzip 1.2.0 2017-02-19 17:02:00 +01:00
andrewnester
15b8b124ae Fixed #74099 - Memory leak with openssl_encrypt() 2017-02-17 21:23:16 +01:00
Nikita Popov
c240feb7f4 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-17 18:44:02 +01:00
Benjamin Robin
513582814b Fixed bug #74105 
If getrandom syscall is unavailable (ENOSYS), try to fallback on
/dev/urandom.
 2017-02-17 18:42:35 +01:00
Nikita Popov
976225ef23 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-16 17:28:05 +01:00
Nikita Popov
cf3ef36323 Fix memory errors in url rewriter 
Strings aren't terminated here...
 2017-02-16 17:24:07 +01:00
Nikita Popov
a381b61f03 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-16 17:00:21 +01:00
Nikita Popov
708973c9bd Fix autoload_func_info destruction 
Can't reference the function ptr after the closure has been
destroyed.
 2017-02-16 16:59:17 +01:00
Nikita Popov
f741f9b656 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-16 12:47:12 +01:00
Mitch Hagstrand
3b91ed112f Make the ftp and stream tests more reliable. 
The tests can sometimes fail because it chooses a passive port for ftp that
is already in use. This makes the test attempt multiple times to find a free
port.
 2017-02-16 12:46:55 +01:00
Nikita Popov
5432d6f982 Add json dep to test 2017-02-16 12:45:24 +01:00