axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dumi...@apache.org
Subject svn commit: r613852 - /webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c
Date Mon, 21 Jan 2008 11:38:43 GMT
Author: dumindu
Date: Mon Jan 21 03:38:42 2008
New Revision: 613852

URL: http://svn.apache.org/viewvc?rev=613852&view=rev
Log:
Reading the ssl passphrase from property.


Modified:
    webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c

Modified: webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c?rev=613852&r1=613851&r2=613852&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c Mon Jan 21 03:38:42
2008
@@ -206,6 +206,7 @@
     axutil_property_t *dump_property = NULL;
     axutil_param_t *ssl_pp_param = NULL;	/* ssl passphrase */
     axis2_char_t *ssl_pp = NULL;
+    axutil_property_t *ssl_pp_property = NULL;
     axutil_property_t *proxy_auth_property = NULL;
     axis2_char_t *proxy_auth_property_value = NULL;
     axis2_bool_t force_proxy_auth = AXIS2_FALSE;
@@ -669,20 +670,31 @@
         axis2_http_simple_request_set_body_string (request,
                                                    env, buffer, buffer_size);
     }
-
+    
     axis2_http_sender_configure_server_cert (sender, env, msg_ctx);
 
     axis2_http_sender_configure_key_file (sender, env, msg_ctx);
-
+    
     axis2_http_sender_get_timeout_values (sender, env, msg_ctx);
     axis2_http_client_set_timeout (sender->client, env, sender->so_timeout);
 
-    ssl_pp_param = axis2_msg_ctx_get_parameter (msg_ctx,
-                                                env, AXIS2_SSL_PASSPHRASE);
-
-    if (ssl_pp_param)
+    ssl_pp_property = axis2_msg_ctx_get_property(msg_ctx, env,
+                                                 AXIS2_SSL_PASSPHRASE);
+    
+    if (ssl_pp_property)
     {
-        ssl_pp = axutil_param_get_value (ssl_pp_param, env);
+            ssl_pp = (axis2_char_t *)
+                     axutil_property_get_value(ssl_pp_property, env);
+    }
+    else
+    {
+        ssl_pp_param = axis2_msg_ctx_get_parameter(msg_ctx,
+                                                   env, AXIS2_SSL_PASSPHRASE);
+
+        if (ssl_pp_param)
+        {
+            ssl_pp = axutil_param_get_value(ssl_pp_param, env);
+        }
     }
 
     proxy_auth_property = (axutil_property_t *) axis2_msg_ctx_get_property (msg_ctx, env,



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message