Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #63527: DCOM does not work with Username, Password parameter
This commit is contained in:
Christoph M. Becker 2020-07-20 14:43:59 +02:00
commit 4b96a75ffd
2 changed files with 3 additions and 1 deletions

2
NEWS
View File

@ -8,6 +8,8 @@ PHP NEWS
- COM:
. Fixed bug #63208 (BSTR to PHP string conversion not binary safe). (cmb)
. Fixed bug #63527 (DCOM does not work with Username, Password parameter).
(cmb)
- Core:
. Fixed bug #79740 (serialize() and unserialize() methods can not be called

View File

@ -133,7 +133,7 @@ PHP_FUNCTION(com_create_instance)
info.pwszName = php_com_string_to_olestring(server_name, server_name_len, obj->code_page);
if (user_name) {
authid.User = php_com_string_to_olestring(user_name, -1, obj->code_page);
authid.User = (OLECHAR*)user_name;
authid.UserLength = (ULONG)user_name_len;
if (password) {