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
107,711 Commits 547 Branches 1,483 Tags
71d16feebbb38f69007d8b7bec44afeb916281fb
Commit Graph

107711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
71d16feebb Fix #76512: \w no longer includes unicode characters 
The migration from PCRE to PCRE2 missed to rename once occurrence of
`PCRE_UCP` to `PCRE2_UCP`.  We fix that.  We also revert the changes to
bug52971.phpt which had been incorrectly made in commit a5bc5ae[1].

[1] <http://git.php.net/?p=php-src.git;a=commit;h=a5bc5aed71f7a15f14f33bb31b8e17bf5f327e2d>
 2018-06-21 22:45:08 +02:00
Jakub Zelenka
c2a3ab070b Merge branch 'PHP-7.2' 2018-06-21 17:03:07 +01:00
Jakub Zelenka
d95ee27551 Make new openssl ext tests in 7.2 consitent 2018-06-21 17:02:44 +01:00
Jakub Zelenka
5f349b728e Merge branch 'PHP-7.2' 2018-06-21 16:50:45 +01:00
Jakub Zelenka
77bd405959 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-21 16:47:08 +01:00
Jakub Zelenka
b20bcbc363 Use unix NL in all openssl ext tests 2018-06-21 16:43:32 +01:00
Jakub Zelenka
3c42f64e6e Make code in openssl ext tests more consistent 
Mainly use spaces for indent and fix some other CS issues. Also
drop checks for unsupported OpenSSL library versions.
 2018-06-21 16:38:19 +01: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
Peter Kokot
3f96f01e9e Bump phar and hash extension version to match PHP version 2018-06-21 13:15:32 +02:00
Dmitry Stogov
4418d61ca3 Avoid reusing zend_function.common.prototype for magic things (use reserved fields instead). 2018-06-21 13:09:25 +03:00
Anatol Belski
f87cc89f4d Gereralize VA macro expansion mechanism 
Avoids code duplication and makes in usable elsewhere.
 2018-06-21 11:50:48 +02:00
Xinchen Hui
4bd6be8a5f Update NEWS 2018-06-21 17:27:18 +08: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
e62c6e7dbe Update NEWS 2018-06-21 17:26:45 +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
Stanislav Malyshev
3f53b02a53 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Revert "ICU 59+ requires C++11 and errors out without the option"
 2018-06-20 10:42:04 -07:00
Stanislav Malyshev
011be49dda Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Revert "ICU 59+ requires C++11 and errors out without the option"
 2018-06-20 10:41:59 -07:00
Stanislav Malyshev
bcf2e10ae7 Revert "ICU 59+ requires C++11 and errors out without the option" 
This reverts commit 5dd1ef90ca.
 2018-06-20 10:41:41 -07:00
Nikita Popov
22ce955b95 Remove unnnecessary DEREF parameter 2018-06-20 16:03:50 +02:00
Nikita Popov
e357f67faf Remove code duplication 
And fix indentation
 2018-06-20 15:05:08 +02:00
Nikita Popov
8e2f0824f7 Merge branch 'PHP-7.2' 2018-06-20 12:32:20 +02:00
Nikita Popov
44f4d2be01 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-20 12:30:19 +02:00
Nikita Popov
69dee5c732 Fixed bug #73342 
Directly listen on socket, instead of duping it to STDIN and
listening on that.
 2018-06-20 12:28:15 +02:00
Stanislav Malyshev
2825c82076 Merge branch 'pull-request/3281' 
* pull-request/3281:
  Revert braces inside condition
  Use .= where possible
  Remove unncecessary parantheses
  Remove unused variable old_php
  Fix property name
 2018-06-19 22:43:20 -07:00
Stanislav Malyshev
3346659f2a Merge branch 'pull-request/3274' 
* pull-request/3274:
  Added const modifier
  76363: added jsm extension to list of mime types
 2018-06-19 16:50:16 -07:00
Stanislav Malyshev
f61e1d28fe Merge branch 'pull-request/3288' 
* pull-request/3288:
  Fix bug #75481: makedev warning
 2018-06-19 16:43:52 -07:00
Stanislav Malyshev
30bdc09129 Merge branch 'pull-request/3309' 
* pull-request/3309:
  phar module, unsignedness check changes. while at it, correcting seemingly subtle bug when checking extension validity.
 2018-06-19 16:42:28 -07:00
Sara Golemon
1108b5a19b Move class constant definition to the right enum file 2018-06-19 18:21:08 -04:00
Christoph M. Becker
963998f0ab Update NEWS for 7.3.0alpha3 2018-06-19 15:36:31 +02:00
Gabriel Caruso
fc775f6915 Report unknown variables passed to compact() 2018-06-19 12:50:15 +02:00
Robert Lu
ecc1a7c582 Fix bug #44217: Output after stdout/stderr closed cause immediate exit with status 0 
We exit with status 255 instead.
 2018-06-19 12:15:33 +02:00
David Carlier
80bb649ad1 phar module, unsignedness check changes. 
while at it, correcting seemingly subtle bug when checking
extension validity.
 2018-06-18 14:08:50 +00:00
Dmitry Stogov
84d7d4e1cc Fixed bug #76466 (Loop variable confusion) 2018-06-18 11:21:23 +03:00
Xinchen Hui
83a77f5a28 Fixed typo 2018-06-18 12:14:17 +08:00
Xinchen Hui
7f196c45ef use defined macro 2018-06-18 12:14:00 +08:00
Xinchen Hui
4d69bbeee7 Fixed bug #76437 (token_get_all with TOKEN_PARSE flag fails to recognise close tag) 2018-06-18 11:33:48 +08:00
Stanislav Malyshev
24f7096154 Merge branch 'PHP-7.2' 
* PHP-7.2:
  ICU 59+ requires C++11 and errors out without the option
  Fix #76300 - Dont attempt to change visibility of a parent private
 2018-06-17 16:43:46 -07:00
Stanislav Malyshev
61a4fc4e44 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  ICU 59+ requires C++11 and errors out without the option
 2018-06-17 16:42:49 -07:00
Stanislav Malyshev
5dd1ef90ca ICU 59+ requires C++11 and errors out without the option 2018-06-17 16:42:41 -07: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
Stanislav Malyshev
5819ff4865 Merge branch 'pull-request/3268' 
* pull-request/3268:
  Sync sysvsem and sysvshm versions in phpinfo
 2018-06-17 14:12:45 -07:00
Stanislav Malyshev
201f440760 Merge branch 'pull-request/3295' 
* pull-request/3295:
  Remove old and unused warnings when building apache
 2018-06-17 14:11:07 -07:00
Stanislav Malyshev
19d5656b1a Merge branch 'pull-request/3307' 
* pull-request/3307:
  Bump snmp extension version to PHP version
 2018-06-17 14:06:40 -07:00
Stanislav Malyshev
d7ed929e1c Merge branch 'pull-request/3296' 
* pull-request/3296:
  Bump fileinfo extension version to PHP release version
 2018-06-17 14:05:01 -07:00
Stanislav Malyshev
0e7460d793 Merge branch 'pull-request/3304' 
* pull-request/3304:
  Bump intl extension version to PHP release version
 2018-06-17 13:54:04 -07:00
Xinchen Hui
77e632d04f only warning when the flag is true 2018-06-17 11:39:08 +08:00
Peter Kokot
be49d61b19 Remove old SVN keywords substitutions 
When the PHP source code was versioned in Subversion, there was
possible to substitute certain keywords such as $Id$ with revision
number, last change time and author name. Such approach is not used
in Git so this patch removes these outdated artifacts from source
code files.
 2018-06-16 13:04:30 +02:00