You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ma...@apache.org on 2008/05/16 10:33:28 UTC
svn commit: r656962 - in /webservices/axis2/branches/c/post_1_4_mtom/c: ./
axiom/include/axiom_mime_parser.h axiom/src/attachments/mime_parser.c
include/axis2_const.h src/core/transport/http/util/http_transport_utils.c
Author: manjula
Date: Fri May 16 01:33:27 2008
New Revision: 656962
URL: http://svn.apache.org/viewvc?rev=656962&view=rev
Log:
changing constants.
Modified:
webservices/axis2/branches/c/post_1_4_mtom/c/ (props changed)
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_mime_parser.h
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_parser.c
webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_const.h
webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c
Propchange: webservices/axis2/branches/c/post_1_4_mtom/c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 16 01:33:27 2008
@@ -1 +1 @@
-/webservices/axis2/trunk/c:1-655426
+/webservices/axis2/trunk/c:1-656107
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_mime_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_mime_parser.h?rev=656962&r1=656961&r2=656962&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_mime_parser.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/include/axiom_mime_parser.h Fri May 16 01:33:27 2008
@@ -39,7 +39,7 @@
#endif
#define AXIOM_MIME_PARSER_BUFFER_SIZE 1024
-#define AXIOM_MIME_PARSER_MAX_CHUNK_BUFFERS 1000
+#define AXIOM_MIME_PARSER_MAX_BUFFERS 1000
#define AXIOM_MIME_PARSER_END_OF_MIME_MAX_COUNT 100
@@ -128,7 +128,7 @@
* @return mime parts as a hash map
*/
AXIS2_EXTERN void AXIS2_CALL
- axiom_mime_parser_set_chunk_buffer_size(
+ axiom_mime_parser_set_buffer_size(
axiom_mime_parser_t * mime_parser,
const axutil_env_t * env,
int size);
@@ -141,7 +141,7 @@
* @return VOID
*/
AXIS2_EXTERN void AXIS2_CALL
- axiom_mime_parser_set_max_chunk_buffers(
+ axiom_mime_parser_set_max_buffers(
axiom_mime_parser_t * mime_parser,
const axutil_env_t * env,
int num);
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_parser.c?rev=656962&r1=656961&r2=656962&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_parser.c Fri May 16 01:33:27 2008
@@ -26,8 +26,8 @@
axutil_hash_t *mime_parts_map;
int soap_body_len;
axis2_char_t *soap_body_str;
- int chunk_buffer_size;
- int max_chunk_buffers;
+ int buffer_size;
+ int max_buffers;
};
struct axiom_search_info
@@ -156,8 +156,8 @@
mime_parser->mime_parts_map = NULL;
mime_parser->soap_body_len = 0;
mime_parser->soap_body_str = NULL; /* shallow copy */
- mime_parser->chunk_buffer_size = 1;
- mime_parser->max_chunk_buffers = AXIOM_MIME_PARSER_MAX_CHUNK_BUFFERS;
+ mime_parser->buffer_size = 1;
+ mime_parser->max_buffers = AXIOM_MIME_PARSER_MAX_BUFFERS;
mime_parser->mime_parts_map = axutil_hash_make(env);
if (!(mime_parser->mime_parts_map))
@@ -218,7 +218,7 @@
int malloc_len = 0;
buf_array = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t *) * (mime_parser->max_chunk_buffers));
+ sizeof(axis2_char_t *) * (mime_parser->max_buffers));
if (!buf_array)
@@ -229,7 +229,7 @@
}
len_array = AXIS2_MALLOC(env->allocator,
- sizeof(int) * (mime_parser->max_chunk_buffers));
+ sizeof(int) * (mime_parser->max_buffers));
if (!len_array)
{
@@ -477,8 +477,6 @@
{
return NULL;
}
- /*buf_array[buf_num] = buf_array[buf_num] + search_info->match_len1 + temp_mime_boundary_size;
- len_array[buf_num] = len_array[buf_num] - search_info->match_len1 - temp_mime_boundary_size;*/
}
else
{
@@ -499,16 +497,12 @@
{
return NULL;
}
- /*buf_array[buf_num] = buf_array[buf_num] + search_info->match_len2;
- len_array[buf_num] = len_array[buf_num] - search_info->match_len2; */
}
else
{
return NULL;
}
}
- /*end_of_mime = (AXIOM_MIME_BOUNDARY_BYTE == *(buf_array[*buf_num])) &&
- (AXIOM_MIME_BOUNDARY_BYTE == *(buf_array[*buf_num] + 1));*/
}
if(search_info->match_len2 == 0)
@@ -547,9 +541,34 @@
{
return NULL;
}
- }
+ }
+
+ if (buf_array)
+ {
+ AXIS2_FREE(env->allocator, buf_array);
+ buf_array = NULL;
+ }
+
+ if (len_array)
+ {
+ AXIS2_FREE(env->allocator, len_array);
+ len_array = NULL;
+ }
+
+ if(temp_mime_boundary)
+ {
+ AXIS2_FREE(env->allocator, temp_mime_boundary);
+ temp_mime_boundary = NULL;
+ }
+
+ if(search_info)
+ {
+ AXIS2_FREE(env->allocator, search_info);
+ search_info = NULL;
+ }
return mime_parser->mime_parts_map;
+
}
static axis2_char_t *axiom_mime_parser_search_for_crlf(
@@ -897,8 +916,6 @@
{
memcpy(part_str + temp, buf_list[i], len_list[i]);
temp += len_list[i];
- /*AXIS2_FREE(env->allocator, buf_list[i]);
- buf_list[i] = NULL;*/
}
}
@@ -1245,20 +1262,20 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_mime_parser_set_chunk_buffer_size(
+axiom_mime_parser_set_buffer_size(
axiom_mime_parser_t *mime_parser,
const axutil_env_t *env,
int size)
{
- mime_parser->chunk_buffer_size = size;
+ mime_parser->buffer_size = size;
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_mime_parser_set_max_chunk_buffers(
+axiom_mime_parser_set_max_buffers(
axiom_mime_parser_t *mime_parser,
const axutil_env_t *env,
int num)
{
- mime_parser->max_chunk_buffers = num;
+ mime_parser->max_buffers = num;
}
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_const.h?rev=656962&r1=656961&r2=656962&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_const.h (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/include/axis2_const.h Fri May 16 01:33:27 2008
@@ -353,8 +353,8 @@
#define AXIS2_ATTACHMENT_TEMP_DIR "attachmentDIR"
#define AXIS2_CACHE_ATTACHMENTS "cacheAttachments"
#define AXIS2_FILE_SIZE_THRESHOLD "sizeThreshold"
-#define AXIS2_MTOM_CHUNK_BUFFER_SIZE "MTOMChunkBufferSize"
-#define AXIS2_MTOM_MAX_CHUNK_BUFFERS "MTOMMaxChunkBuffers"
+#define AXIS2_MTOM_BUFFER_SIZE "MTOMBufferSize"
+#define AXIS2_MTOM_MAX_BUFFERS "MTOMMaxBuffers"
/* op_ctx persistance */
#define AXIS2_PERSIST_OP_CTX "persistOperationContext"
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c?rev=656962&r1=656961&r2=656962&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/src/core/transport/http/util/http_transport_utils.c Fri May 16 01:33:27 2008
@@ -323,8 +323,8 @@
{
axiom_mime_parser_t *mime_parser = NULL;
int soap_body_len = 0;
- axutil_param_t *chunk_buffer_size_param = NULL;
- axutil_param_t *max_chunk_buffers_param = 0;
+ axutil_param_t *buffer_size_param = NULL;
+ axutil_param_t *max_buffers_param = 0;
axis2_char_t *value_size = NULL;
axis2_char_t *value_num = NULL;
int size = 0;
@@ -332,13 +332,13 @@
mime_parser = axiom_mime_parser_create(env);
- chunk_buffer_size_param = axis2_msg_ctx_get_parameter (msg_ctx,
+ buffer_size_param = axis2_msg_ctx_get_parameter (msg_ctx,
env,
- AXIS2_MTOM_CHUNK_BUFFER_SIZE);
- if (chunk_buffer_size_param)
+ AXIS2_MTOM_BUFFER_SIZE);
+ if (buffer_size_param)
{
value_size =
- (axis2_char_t *) axutil_param_get_value (chunk_buffer_size_param, env);
+ (axis2_char_t *) axutil_param_get_value (buffer_size_param, env);
if(value_size)
{
size = atoi(value_size);
@@ -346,13 +346,13 @@
}
}
- max_chunk_buffers_param = axis2_msg_ctx_get_parameter (msg_ctx,
+ max_buffers_param = axis2_msg_ctx_get_parameter (msg_ctx,
env,
- AXIS2_MTOM_MAX_CHUNK_BUFFERS);
- if (max_chunk_buffers_param)
+ AXIS2_MTOM_MAX_BUFFERS);
+ if (max_buffers_param)
{
value_num =
- (axis2_char_t *) axutil_param_get_value (max_chunk_buffers_param, env);
+ (axis2_char_t *) axutil_param_get_value (max_buffers_param, env);
if(value_num)
{
num = atoi(value_num);
@@ -741,8 +741,8 @@
{
axiom_mime_parser_t *mime_parser = NULL;
int soap_body_len = 0;
- axutil_param_t *chunk_buffer_size_param = NULL;
- axutil_param_t *max_chunk_buffers_param = 0;
+ axutil_param_t *buffer_size_param = NULL;
+ axutil_param_t *max_buffers_param = 0;
axis2_char_t *value_size = NULL;
axis2_char_t *value_num = NULL;
int size = 0;
@@ -750,14 +750,14 @@
mime_parser = axiom_mime_parser_create(env);
- chunk_buffer_size_param =
+ buffer_size_param =
axis2_msg_ctx_get_parameter (msg_ctx,
env,
- AXIS2_MTOM_CHUNK_BUFFER_SIZE);
- if (chunk_buffer_size_param)
+ AXIS2_MTOM_BUFFER_SIZE);
+ if (buffer_size_param)
{
value_size =
- (axis2_char_t *) axutil_param_get_value (chunk_buffer_size_param, env);
+ (axis2_char_t *) axutil_param_get_value (buffer_size_param, env);
if(value_size)
{
size = atoi(value_size);
@@ -765,13 +765,13 @@
}
}
- max_chunk_buffers_param = axis2_msg_ctx_get_parameter (msg_ctx,
+ max_buffers_param = axis2_msg_ctx_get_parameter (msg_ctx,
env,
- AXIS2_MTOM_MAX_CHUNK_BUFFERS);
- if (max_chunk_buffers_param)
+ AXIS2_MTOM_MAX_BUFFERS);
+ if (max_buffers_param)
{
value_num =
- (axis2_char_t *) axutil_param_get_value (max_chunk_buffers_param, env);
+ (axis2_char_t *) axutil_param_get_value (max_buffers_param, env);
if(value_num)
{
num = atoi(value_num);
@@ -1912,8 +1912,8 @@
axutil_stream_t *stream = NULL;
int soap_body_len = 0;
axis2_char_t *soap_body_str = NULL;
- axutil_param_t *chunk_buffer_size_param = NULL;
- axutil_param_t *max_chunk_buffers_param = 0;
+ axutil_param_t *buffer_size_param = NULL;
+ axutil_param_t *max_buffers_param = 0;
axis2_char_t *value_size = NULL;
axis2_char_t *value_num = NULL;
int size = 0;
@@ -1921,14 +1921,14 @@
mime_parser = axiom_mime_parser_create(env);
- chunk_buffer_size_param =
+ buffer_size_param =
axis2_msg_ctx_get_parameter (msg_ctx,
env,
- AXIS2_MTOM_CHUNK_BUFFER_SIZE);
- if (chunk_buffer_size_param)
+ AXIS2_MTOM_BUFFER_SIZE);
+ if (buffer_size_param)
{
value_size =
- (axis2_char_t *) axutil_param_get_value (chunk_buffer_size_param, env);
+ (axis2_char_t *) axutil_param_get_value (buffer_size_param, env);
if(value_size)
{
@@ -1937,13 +1937,13 @@
}
}
- max_chunk_buffers_param = axis2_msg_ctx_get_parameter (msg_ctx,
+ max_buffers_param = axis2_msg_ctx_get_parameter (msg_ctx,
env,
- AXIS2_MTOM_MAX_CHUNK_BUFFERS);
- if(max_chunk_buffers_param)
+ AXIS2_MTOM_MAX_BUFFERS);
+ if(max_buffers_param)
{
value_num =
- (axis2_char_t *) axutil_param_get_value (max_chunk_buffers_param, env);
+ (axis2_char_t *) axutil_param_get_value (max_buffers_param, env);
if(value_num)
{
num = atoi(value_num);