axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From susan...@apache.org
Subject cvs commit: ws-axis/c/src/server/apache2 mod_axis2.c
Date Mon, 05 Apr 2004 10:56:48 GMT
susantha    2004/04/05 03:56:48

  Modified:    c/src/server/apache mod_axis.c
               c/src/server/apache2 mod_axis2.c
  Log:
  making the use of expat parser by default when there is no compiler directive (USE_XXX_PARSER)
  
  Revision  Changes    Path
  1.25      +8 -4      ws-axis/c/src/server/apache/mod_axis.c
  
  Index: mod_axis.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache/mod_axis.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_axis.c	1 Apr 2004 13:56:42 -0000	1.24
  +++ mod_axis.c	5 Apr 2004 10:56:48 -0000	1.25
  @@ -229,7 +229,8 @@
   	sstr->reserved2 = NULL;
   #else
   	sstr->reserved1 = calloc(NO_OF_SERIALIZE_BUFFERS, sizeof(sendbuffers));
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
   	sstr->reserved2 = malloc(SIZEOFMODULEBUFFER);
   #endif
   #endif
  @@ -238,7 +239,8 @@
   	if ((rc = ap_setup_client_block(req_rec, REQUEST_CHUNKED_ERROR)) != OK)
   	{
   		if (sstr->reserved1) free(sstr->reserved1);
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
   		if (sstr->reserved2) free(sstr->reserved2);
   #endif
   		free(sstr->so.http);
  @@ -280,7 +282,8 @@
   	if(0 != process_request(sstr))
   	{
   		if (sstr->reserved1) free(sstr->reserved1);
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
   		if (sstr->reserved2) free(sstr->reserved2);
   #endif
   		free(sstr->so.http);
  @@ -316,7 +319,8 @@
   	}
   	/*Free the array */
   	if (sstr->reserved1) free(sstr->reserved1);
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
   	if (sstr->reserved2) free(sstr->reserved2);
   #endif
   
  
  
  
  1.9       +8 -4      ws-axis/c/src/server/apache2/mod_axis2.c
  
  Index: mod_axis2.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache2/mod_axis2.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_axis2.c	1 Apr 2004 13:56:42 -0000	1.8
  +++ mod_axis2.c	5 Apr 2004 10:56:48 -0000	1.9
  @@ -304,7 +304,8 @@
   	sstr->reserved2 = NULL;
   #else
   	sstr->reserved1 = calloc(NO_OF_SERIALIZE_BUFFERS, sizeof(sendbuffers));
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
   	sstr->reserved2 = malloc(SIZEOFMODULEBUFFER);
   #endif
   #endif
  @@ -313,7 +314,8 @@
   	if ((rc = ap_setup_client_block(req_rec, REQUEST_CHUNKED_ERROR)) != OK)
   	{
   		if (sstr->reserved1) free(sstr->reserved1); 
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
           if (sstr->reserved2) free(sstr->reserved2); 
   #endif
           free(sstr->so.http); 
  @@ -368,7 +370,8 @@
   	if(0 != process_request(sstr))
   	{
   		if (sstr->reserved1) free(sstr->reserved1); 
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
           if (sstr->reserved2) free(sstr->reserved2); 
   #endif
           free(sstr->so.http); 
  @@ -408,7 +411,8 @@
   	/*Free the array */
   	if (sstr->reserved1) free(sstr->reserved1);
   
  -#ifdef USE_EXPAT_PARSER
  +#ifdef USE_XERCES_PARSER
  +#else
   	if (sstr->reserved2) free(sstr->reserved2);
   #endif
   
  
  
  

Mime
View raw message