diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-20 14:43:59 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-20 14:44:18 +0200 |
| commit | 4b96a75ffd14f692117854c086ca1c748dbf8e5e (patch) | |
| tree | 841505b24e46435c80e544ab5effe7ab328407ed | |
| parent | 0c28b47154d7357ea1f565ac42371df2a5443acc (diff) | |
| parent | b2e3fd1e691b1dc82aaaf4150461db97bd5acf4a (diff) | |
| download | php-git-4b96a75ffd14f692117854c086ca1c748dbf8e5e.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #63527: DCOM does not work with Username, Password parameter
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/com_dotnet/com_com.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index 58a22a9c62..ab8c85e23b 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -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) { |