Author: wrowe
Date: Thu Aug 11 12:34:17 2005
New Revision: 231507
URL: http://svn.apache.org/viewcvs?rev=231507&view=rev
Log:
MAJOR: Changed the preferred thread model to COINIT_MULTITHREADED, only
falling back on STA CoInitialize() if the original CoInitializeEx fails.
PR: 35760
Submitted by: Heino R. Pull <heino federated.com>]
Modified:
httpd/mod_aspdotnet/trunk/CHANGES.txt
httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp
Modified: httpd/mod_aspdotnet/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/CHANGES.txt?rev=231507&r1=231506&r2=231507&view=diff
==============================================================================
--- httpd/mod_aspdotnet/trunk/CHANGES.txt (original)
+++ httpd/mod_aspdotnet/trunk/CHANGES.txt Thu Aug 11 12:34:17 2005
@@ -1,3 +1,8 @@
+Changes to Apache mod_aspdotnet build 2004
+
+ MAJOR: Changed the preferred thread model to COINIT_MULTITHREADED, only
+ falling back on STA CoInitialize() if the original CoInitializeEx fails.
+ [Heino R. Pull <heino federated.com>]
Changes to Apache mod_aspdotnet build 2002
Modified: httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp
URL:
http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp?rev=231507&r1=231506&r2=231507&view=diff
==============================================================================
--- httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp (original)
+++ httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Thu Aug 11 12:34:17 2005
@@ -496,9 +496,9 @@
ap_add_cgi_vars(r);
// Check that THIS thread is coinitialized.
- HRESULT hr = CoInitialize(NULL);
+ HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
if (hr == RPC_E_CHANGED_MODE)
- hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+ hr = CoInitialize(NULL);
if (FAILED(hr)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_FROM_OS_ERROR(hr), r,
