Author: dumindu Date: Sat Dec 8 23:32:16 2007 New Revision: 602648 URL: http://svn.apache.org/viewvc?rev=602648&view=rev Log: Fixed a few probable win32 build issues in the previous commit.
Modified: webservices/axis2/trunk/c/src/core/clientapi/options.c Modified: webservices/axis2/trunk/c/src/core/clientapi/options.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/clientapi/options.c?rev=602648&r1=602647&r2=602648&view=diff ============================================================================== --- webservices/axis2/trunk/c/src/core/clientapi/options.c (original) +++ webservices/axis2/trunk/c/src/core/clientapi/options.c Sat Dec 8 23:32:16 2007 @@ -943,16 +943,20 @@ const axis2_char_t * password, const axis2_char_t * auth_type) { + axis2_bool_t force_proxy_auth = AXIS2_FALSE; + axutil_property_t *prop_pw = NULL; + axutil_property_t *prop_un = NULL; + AXIS2_ENV_CHECK(env, NULL); - axutil_property_t *prop_un = axutil_property_create(env); + + prop_un = axutil_property_create(env); axutil_property_set_value(prop_un, env, axutil_strdup(env, username)); axis2_options_set_property(options, env, AXIS2_PROXY_AUTH_UNAME, prop_un); - axutil_property_t *prop_pw = axutil_property_create(env); + prop_pw = axutil_property_create(env); axutil_property_set_value(prop_pw, env, axutil_strdup(env, password)); axis2_options_set_property(options, env, AXIS2_PROXY_AUTH_PASSWD, prop_pw); - axis2_bool_t force_proxy_auth = AXIS2_FALSE; if(auth_type) { @@ -965,12 +969,13 @@ if (force_proxy_auth) { axutil_property_t *proxy_auth_property = axutil_property_create(env); + axutil_property_t *proxy_auth_type_property = axutil_property_create(env); + axutil_property_set_value(proxy_auth_property, env, axutil_strdup(env, AXIS2_VALUE_TRUE)); axis2_options_set_property(options, env, AXIS2_FORCE_PROXY_AUTH, proxy_auth_property); - axutil_property_t *proxy_auth_type_property = axutil_property_create(env); axutil_property_set_value(proxy_auth_type_property, env, axutil_strdup(env, auth_type)); axis2_options_set_property(options, env, AXIS2_PROXY_AUTH_TYPE, @@ -995,16 +1000,20 @@ const axis2_char_t * password, const axis2_char_t * auth_type) { + axis2_bool_t force_http_auth = AXIS2_FALSE; + axutil_property_t *prop_un = NULL; + axutil_property_t *prop_pw = NULL; + AXIS2_ENV_CHECK(env, NULL); - axutil_property_t *prop_un = axutil_property_create(env); + + prop_un = axutil_property_create(env); axutil_property_set_value(prop_un, env, axutil_strdup(env, username)); axis2_options_set_property(options, env, AXIS2_HTTP_AUTH_UNAME, prop_un); - axutil_property_t *prop_pw = axutil_property_create(env); + prop_pw = axutil_property_create(env); axutil_property_set_value(prop_pw, env, axutil_strdup(env, password)); axis2_options_set_property(options, env, AXIS2_HTTP_AUTH_PASSWD, prop_pw); - axis2_bool_t force_http_auth = AXIS2_FALSE; if (auth_type) { @@ -1017,12 +1026,13 @@ if (force_http_auth) { axutil_property_t *http_auth_property = axutil_property_create(env); + axutil_property_t *http_auth_type_property = axutil_property_create(env); + axutil_property_set_value(http_auth_property, env, axutil_strdup(env, AXIS2_VALUE_TRUE)); axis2_options_set_property(options, env, AXIS2_FORCE_HTTP_AUTH, http_auth_property); - axutil_property_t *http_auth_type_property = axutil_property_create(env); axutil_property_set_value(http_auth_type_property, env, axutil_strdup(env, auth_type)); axis2_options_set_property(options, env, AXIS2_HTTP_AUTH_TYPE, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]