diff options
author | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
commit | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (patch) | |
tree | 5e021f37f7272c93926759b22f6e7823a584f542 /ext/com_dotnet | |
parent | 14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e (diff) | |
parent | 8904fbc6929aaf623d88127f876fa739c9ec627b (diff) | |
download | php-git-4f3ac2cdbedf7a84d64bfee7405f0c023641a806.tar.gz |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
NEWS
adapt test for error message introduce in fix for #68463
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
run a few request in this test
fix test
fix test
added info about some other macro changes
added note about toolset and phpize
added note about the response files
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
split formatter_format*.phpt for ICP 54.1
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
fix icu version to test
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
clone dateformat_calendars_variant3.phpt for ICU 54.1
split collator_get_sort_key_variant3.phpt for icu 54.1
...
Diffstat (limited to 'ext/com_dotnet')
-rw-r--r-- | ext/com_dotnet/com_typeinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c index ac5777cef1..f07d7ff65d 100644 --- a/ext/com_dotnet/com_typeinfo.c +++ b/ext/com_dotnet/com_typeinfo.c @@ -67,7 +67,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codep hr = LoadRegTypeLib((REFGUID)&clsid, major_i, minor_i, LANG_NEUTRAL, &TL); /* if that failed, assumed that the GUID is actually a CLSID and - * attemp to get the library via an instance of that class */ + * attempt to get the library via an instance of that class */ if (FAILED(hr) && (major == NULL || minor == NULL)) { IDispatch *disp = NULL; ITypeInfo *info = NULL; |