php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-16 20:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,013 Commits 547 Branches 1,483 Tags
81eb8e7507bdec00a6dde4ac759d668d048b6f13
Commit Graph

4171 Commits

Author SHA1 Message Date
Anatol Belski
0fbbdd3aa1 [ci skip] Fix EOL 2018-07-07 17:14:54 +02:00
seliver
95013042bf Fixed bug #76136 (stream_socket_get_name enclosed IPv6 in brackets) 
The IPv6 IP of a socket is provided by inet_ntop() as a string, but
this function doesn't enclose the IP in brackets. This patch adds
them in the php_network_populate_name_from_sockaddr() function.
 2018-07-07 11:47:50 +02:00
Christoph M. Becker
b37dafcc23 Add test for PR #2382 2018-07-06 18:59:04 +02:00
Nikita Popov
0c4ab798de Merge branch 'PHP-7.2' 2018-07-05 19:10:24 +02:00
Nikita Popov
0504594a28 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-05 19:09:40 +02:00
Nikita Popov
791f07e4f0 Fix string.strip_tags filter 
Was segfaulting if no allowed tags are specified and performing an
out of bounds read if they were.
 2018-07-05 19:08:00 +02:00
Nikita Popov
2cc6922cbf Merge branch 'PHP-7.2' 2018-07-02 17:59:33 +02:00
Nikita Popov
3a236d0587 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-02 17:59:15 +02:00
Nikita Popov
787593b708 Fix test after serialization change 
And move it to a more appropriate location.
 2018-07-02 17:58:26 +02:00
Nikita Popov
a57b5e82a9 Merge branch 'PHP-7.2' 2018-07-02 17:30:07 +02:00
Nikita Popov
09bb2527e9 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-02 17:29:32 +02:00
Nikita Popov
c793885b76 Fixed bug #74670 
Validate that "C" serialization payload is followed by "}" prior to
calling the unserialize() handler. This mitigates issues caused by
unserialize() not correctly handling strings that are not NUL
terminated. Making sure that there is a "}" at the end avoids the
problem.
 2018-07-02 17:27:43 +02:00
Anatol Belski
6d61814d0e Remove the forked test and adjust the original one 2018-07-02 16:08:09 +02:00
Christoph M. Becker
abbc1e683c Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #71848: getimagesize with $imageinfo returns false
 2018-06-30 16:50:49 +02:00
Christoph M. Becker
e2285eb542 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #71848: getimagesize with $imageinfo returns false
 2018-06-30 16:40:32 +02:00
Christoph M. Becker
ae04110032 Fix #71848: getimagesize with $imageinfo returns false 
Some JFIF images contain empty APP segments, i.e. those which consist
only of the marker bytes and the length, but without actual content.
It appears to be doubtful to have empty APP segments, but we should
apply the robustness principle, and accept these, instead of simply
failing in this case.

We choose to add empty APP segments to $imageinfo with an empty string
as value, instead of NULL, or even to omit these segments altogether.

This patch also fixes the potential issue that php_stream_read() might
not read the supposed number of bytes, which could result in garbage to
be added to the read value.
 2018-06-30 16:29:30 +02:00
Kalle Sommer Nielsen
76827e39ba Minor cleanup in regards to magic_quotes in tests: 
- dba008.phpt never runs anyway, no need to keep it
- bug75357.phpt has a branch that is never hit, which should not change the bug behavior in anyway
- bug55371.phpt added a simple 'done' test to not let the EXPECT section be empty
 2018-06-26 22:38:00 +02:00
Charles R. Portwood II
55277a6684 RFC: Argon2 Password Hash Enhancements Implementation of Argon2id per RFC https://wiki.php.net/rfc/argon2_password_hash_enhancements 
- m4 and Windows configure scripts now forces Argon2 reference library version >= 20161029
- Implementation tested against 20161029 and 20171227 for Argon2id support
- Updates Argon2 ext/standard/password/tests to run tests for both Argon2i and Argon2id
 2018-06-21 13:26:57 +02:00
Xinchen Hui
8b2f40724b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Update NEWS
  Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
 2018-06-21 17:26:57 +08:00
Xinchen Hui
939e1095f2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
 2018-06-21 17:26:27 +08:00
Xinchen Hui
6531719da5 Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys) 2018-06-21 17:26:05 +08:00
Gabriel Caruso
fc775f6915 Report unknown variables passed to compact() 2018-06-19 12:50:15 +02:00
Pedro Magalhães
13e9a471d7 Fix #76300 - Dont attempt to change visibility of a parent private 2018-06-17 15:53:55 -07:00
Stanislav Malyshev
7d7b7e801e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #76300 - Dont attempt to change visibility of a parent private
 2018-06-17 15:47:06 -07:00
Stanislav Malyshev
671fc2ec55 Merge branch 'pull-request/3233' into PHP-7.2 
* pull-request/3233:
  Fix #76300 - Dont attempt to change visibility of a parent private
 2018-06-17 15:26:42 -07:00
Anatol Belski
9cd2d77514 Fixed bug #76422 ftruncate fails on files > 2GB 2018-06-09 11:28:24 +02:00
Stanislav Malyshev
c12fc77bdf Fix bug #76390 - do not allow invalid strings in range() 2018-06-04 22:54:03 -07:00
Stanislav Malyshev
5fbb0988d1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #76390 - do not allow invalid strings in range()
 2018-06-04 22:51:38 -07:00
Stanislav Malyshev
73bf238507 Fix bug #76390 - do not allow invalid strings in range() 2018-06-04 22:44:05 -07:00
Peter Kokot
af01ef8741 Remove unused binary_pipes option 
Option binary_pipes was added in PHP 6 which was then refactored
and this option was removed.
 2018-05-28 22:14:37 +02:00
Anatol Belski
4fc68911ca Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76335 "link(): Bad file descriptor" with non-ASCII path
 2018-05-14 10:45:22 +02:00
Anatol Belski
1228f31cd2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76335 "link(): Bad file descriptor" with non-ASCII path
 2018-05-14 10:44:49 +02:00
Anatol Belski
9b8d8cac04 Fixed bug #76335 "link(): Bad file descriptor" with non-ASCII path 2018-05-14 10:43:11 +02:00
Pedro Magalhães
2dca8671e4 Fix #76300 - Dont attempt to change visibility of a parent private 2018-05-03 21:54:44 +01:00
Chris Wright
658a23a974 Remove warnings from inet_pton()/inet_ntop() 2018-04-03 14:51:47 +01:00
johnstevenson
5ff9d229ef Test ini file reporting functions 2018-03-27 22:07:12 +02:00
timurib
f7f48643e7 Remove redundant warning in array_push() and array_unshift() 
Cf. https://github.com/php/php-src/pull/3011.
 2018-03-25 17:49:04 +02:00
Christoph M. Becker
5cb825df72 Fix #69948: path/domain are not sanitized in setcookie 
For improved security, characters not allowed for name and value should
also be forbidden for path and domain.
 2018-03-24 17:32:30 +01:00
Nikita Popov
ad87e2bd6a Merge branch 'PHP-7.2' 2018-03-23 18:57:58 +01:00
atvoicu
17ed2f21cf Add missing skip prefix for some SKIPIF messages 2018-03-23 18:56:36 +01:00
Dmitry Stogov
8598240c69 Fixed a behavior break introduced by d7f2dc4ec6 2018-03-22 16:37:34 +03:00
Anatol Belski
192956bb7f Switch to placeholder matching 2018-03-16 18:57:32 +01:00
Anatol Belski
6bbc4bf57e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Sync test with newer output
 2018-03-16 18:56:55 +01:00
Anatol Belski
615ca3c99d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync test with newer output
 2018-03-16 18:56:08 +01:00
Anatol Belski
dfc07f038b Sync test with newer output 
Czech Republic vs. newer Czechia
 2018-03-16 18:54:55 +01:00
Gabriel Caruso
d0ee2a8254 Add is_countable function 
RFC: https://wiki.php.net/rfc/is-countable
 2018-03-11 16:41:16 +01:00
Anatol Belski
363e0450aa Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
 2018-03-10 11:21:01 +01:00
Anatol Belski
cf0012dad0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
 2018-03-10 11:20:11 +01:00
Anatol Belski
8417a23973 Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault 2018-03-10 11:18:21 +01:00
Nikita Popov
4838e9799f Merge branch 'PHP-7.2' 2018-03-05 15:33:34 +01:00