Skip to content

Commit 4b96a75

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #63527: DCOM does not work with Username, Password parameter
2 parents 0c28b47 + b2e3fd1 commit 4b96a75

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ PHP NEWS
88

99
- COM:
1010
. Fixed bug #63208 (BSTR to PHP string conversion not binary safe). (cmb)
11+
. Fixed bug #63527 (DCOM does not work with Username, Password parameter).
12+
(cmb)
1113

1214
- Core:
1315
. Fixed bug #79740 (serialize() and unserialize() methods can not be called

ext/com_dotnet/com_com.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ PHP_FUNCTION(com_create_instance)
133133
info.pwszName = php_com_string_to_olestring(server_name, server_name_len, obj->code_page);
134134

135135
if (user_name) {
136-
authid.User = php_com_string_to_olestring(user_name, -1, obj->code_page);
136+
authid.User = (OLECHAR*)user_name;
137137
authid.UserLength = (ULONG)user_name_len;
138138

139139
if (password) {

0 commit comments

Comments
 (0)