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

108668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
dd3fb58e7c Merge branch 'master' of git.php.net:/php-src 
* 'master' 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:30 +08:00
Xinchen Hui
6078491720 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed bug #76825 (Undefined symbols ___cpuid_count)
 2018-09-04 17:26:56 +08:00
Xinchen Hui
3497b75b73 Fixed bug #76825 (Undefined symbols ___cpuid_count) 2018-09-04 17:26:46 +08:00
Joe Watkins
efbc05a5a8 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix bug #74764 and add a test case
 2018-09-04 11:14:57 +02: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
59be8d52d4 Merge branch 'PHP-7.3' 
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-09-04 11:03:56 +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
e1d12b337d Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
 2018-09-04 10:57:47 +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
ee33c943e7 Merge branch 'PHP-7.3' 2018-09-04 08:09:22 +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
d9aec118df Merge branch 'PHP-7.3' 2018-09-04 05:57:43 +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
6cb725e0a7 Merge branch 'PHP-7.3' 2018-09-04 05:33:00 +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
213091b37e Merge branch 'PHP-7.3' 2018-09-04 05:08:47 +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
e48e9c0002 Merge branch 'PHP-7.3' 2018-09-04 04:58:44 +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
Dmitry Stogov
437e91e194 Keep collision list ordered from higher to lower buckets. 2018-09-04 01:19:07 +03:00
Tiffany
318b34da05 Update grammar and clarify wording in couple places 
On line 512, I clarified the sentence which uses effect, previously the sentence was awkward.
On line 656, the wrong word is used, I changed affect to effect.
 2018-09-03 22:04:37 +02:00
Anatol Belski
e0b91051ae Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
 2018-09-03 15:11:45 +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
Dmitry Stogov
887e126240 Fixed condition 2018-09-03 14:50:35 +03:00
Christoph M. Becker
f543476e89 Fix off-by-one errors in skip reasons 2018-09-03 12:46:34 +02:00
Christoph M. Becker
d36cb3d30e Merge branch 'PHP-7.3' 
* PHP-7.3:
  Update to Oniguruma 6.9.0
 2018-09-03 12:26:42 +02:00
Christoph M. Becker
3e863ff29e Update to Oniguruma 6.9.0 2018-09-03 12:26:03 +02:00
Dmitry Stogov
a57ec0aeb5 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed reference-countingin ZTS build.
 2018-09-03 10:21:55 +03: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
ef999f0735 Merge branch 'PHP-7.3' 2018-09-02 20:03:03 +01: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