php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 11:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,469 Commits 547 Branches 1,483 Tags
48fd1d2ea176d05784b552faa41610ff53b6e395
Commit Graph

108469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
48fd1d2ea1 Merge branch 'PHP-7.3' of git.php.net:/php-src into PHP-7.3 
* 'PHP-7.3' of git.php.net:/php-src:
  Fix bug #74764 and add a test case
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-09-04 17:27:41 +08:00
Xinchen Hui
3497b75b73 Fixed bug #76825 (Undefined symbols ___cpuid_count) 2018-09-04 17:26:46 +08:00
Joe Watkins
6b5e7e6b42 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #74764 and add a test case
 2018-09-04 11:13:14 +02:00
Joe Watkins
21f8cd2a92 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #74764 and add a test case
 2018-09-04 11:12:39 +02:00
Ville Hukkamaki
0f724453c0 Fix bug #74764 and add a test case 2018-09-04 11:12:04 +02:00
Anatol Belski
7585a20d44 [ci skip] Update NEWS 2018-09-04 11:03:33 +02:00
Anatol Belski
b6e7aab5f2 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-09-04 11:03:01 +02:00
Anatol Belski
64d2978546 [ci skip] Update NEWS 2018-09-04 11:02:26 +02:00
Anatol Belski
9459b45e2b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-09-04 11:01:57 +02:00
Anatol Belski
e58690a26d [ci skip] Update NEWS 2018-09-04 11:01:24 +02:00
Anatol Belski
7d8e6e6394 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
 2018-09-04 10:57:25 +02:00
Anatol Belski
2476fb76a7 Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3 
It would probably be better to remove this test as it's too much
maintanance for a little gain.
 2018-09-04 10:53:35 +02:00
Nikita Popov
d36230fcab Fix incorrect literal freeing if pass_two generates fatal error 2018-09-04 08:08:39 +02:00
Nikita Popov
63072e9c0e Merge branch 'PHP-7.2' into PHP-7.3 2018-09-04 05:57:07 +02:00
Nikita Popov
edec566d9b Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 05:49:02 +02:00
Nikita Popov
03740ef7df Revert all MySQL auth related changes 
Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.

Revert "Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)"

This reverts commit 11507c0e1b.

Revert "Fix mysqlnd build without openssl"

This reverts commit 6c9db02ff7.

Revert "Fix VC compilation as variable size array is not supported"

This reverts commit f96df64cb2.

Revert "Fix MySQL 8 auth"

This reverts commit d6e81f0bfd.
 2018-09-04 05:47:28 +02:00
Nikita Popov
4cbabb6852 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-04 05:32:52 +02:00
Nikita Popov
08addfea86 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 05:32:42 +02:00
Nikita Popov
f1f39d7ed7 Fix parenthesis warning 2018-09-04 05:32:25 +02:00
Peter Kokot
870d893d0b Fix bug #75481: makedev warning 
To use makedev the sys/sysmacros.h needs to be included on newer
systems.

Cherry-picked from PHP-7.3.
 2018-09-04 05:13:45 +02:00
Nikita Popov
153e292e10 Escape trigraph sequence 
??= is a trigraph for #, so it needs to be escaped. To stay
consistent I'm escaping all question marks in this literal, even
though one of the latter two would suffice.
 2018-09-04 05:07:43 +02:00
Nikita Popov
6122f67492 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-04 04:57:13 +02:00
Nikita Popov
fcf78dfb89 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 04:55:15 +02:00
Ville Hukkamaki
742783c3ee Fixed bug #73457 
Correctly report errors when opening FTP data connection.
 2018-09-04 04:53:38 +02:00
Anatol Belski
1640d9182a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
 2018-09-03 15:11:10 +02:00
Anatol Belski
a6b8651d94 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
 2018-09-03 15:10:25 +02:00
Anatol Belski
f26172f934 Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS 2018-09-03 15:09:23 +02:00
Christoph M. Becker
3e863ff29e Update to Oniguruma 6.9.0 2018-09-03 12:26:03 +02:00
Dmitry Stogov
bc731f8e7a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed reference-countingin ZTS build.
 2018-09-03 10:21:42 +03:00
Dmitry Stogov
accf5ed621 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed reference-countingin ZTS build.
 2018-09-03 10:21:32 +03:00
Dmitry Stogov
7fde2243a7 Fixed reference-countingin ZTS build. 2018-09-03 10:20:40 +03:00
Jakub Zelenka
217888ed26 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-02 20:02:09 +01:00
Jakub Zelenka
cd0a37994e Fix stream_security_level.phpt with OpenSSL 1.1.1 2018-09-02 20:00:08 +01:00
Christoph M. Becker
0a51e75e28 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #75696: posix_getgrnam fails to print details of group
 2018-09-01 14:30:08 +02:00
Christoph M. Becker
7bcda659f8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #75696: posix_getgrnam fails to print details of group
 2018-09-01 14:28:13 +02:00
Christoph M. Becker
2677d43850 Fix #75696: posix_getgrnam fails to print details of group 
According to the POSIX specification of `getgrnam_r()` the result of
`sysconf(_SC_GETGR_R_SIZE_MAX)` is an initial value suggested for the
size of the buffer, and `ERANGE` signals that insufficient storage was
supplied.  So if we get `ERANGE`, we try again with a buffer twice as
big, and so on, instead of failing.
 2018-09-01 14:25:59 +02:00
Anatol Belski
bcfe5f5845 [ci skip] Update NEWS 2018-09-01 11:33:39 +02:00
Anatol Belski
4a43e5fb4f Improve fix for bug #76829 2018-09-01 01:12:06 +02:00
Anatol Belski
b9ca573a1b Fixed bug #76829 Incorrect validation of domain on idn_to_utf8() function 
As stated by RFC 5890, U-Labels might be up to 252 Unicode code points
long. This can be fixed in 7.1+ as well, but there might potentially be
issues in some existing apps expecting the output to be max 255 octets
long. Thus it seems to be safer to not to touch stable branches.
 2018-09-01 00:14:23 +02:00
Anatol Belski
3f2a3c5aec Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix stack underflow in phar
 2018-08-30 19:34:23 +02:00
Anatol Belski
1ccc4ff260 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix stack underflow in phar
 2018-08-30 19:34:01 +02:00
Anatol Belski
7fb7869e13 Fix stack underflow in phar 
The checks can issue reads below and above the temporary buffer. A read
itself doesn't seem dangerous, but the condition result can be
arbitrary. Such reads have to be avoided. Likely this patch should be
backported.

(cherry picked from commit b053beee7e)
 2018-08-30 19:33:07 +02:00
Christoph M. Becker
c5231ad394 Fix #76820: Z_COPYABLE invalid definition 
We remove the extraneous parenthesis.
 2018-08-30 18:00:51 +02:00
Anatol Belski
09ea23f7d6 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Switch to staging series on AppVeyor
 2018-08-30 17:39:39 +02:00
Anatol Belski
58339f37e5 Switch to staging series on AppVeyor 2018-08-30 17:38:51 +02:00
Remi Collet
cc63568400 NEWS for #76818 2018-08-30 14:50:26 +02:00
Remi Collet
cf6c32545e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix double cast to int on 32-bit
 2018-08-30 09:04:43 +02:00
Remi Collet
6e703c957e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix double cast to int on 32-bit
 2018-08-30 09:04:13 +02:00
Remi Collet
c1729272b1 fix double cast to int on 32-bit 2018-08-30 09:03:50 +02:00
Dmitry Stogov
566a75e97c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).
 2018-08-29 23:41:22 +03:00