You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by da...@apache.org on 2010/07/07 08:59:04 UTC
svn commit: r961258 - in /axis/axis2/c/core/trunk:
src/core/transport/http/common/ util/include/platforms/os400/
util/include/platforms/unix/ util/include/platforms/windows/
util/src/minizip/
Author: damitha
Date: Wed Jul 7 06:59:04 2010
New Revision: 961258
URL: http://svn.apache.org/viewvc?rev=961258&view=rev
Log:
jira AXIS2C-1472 and jira AXIS2C-1483
Modified:
axis/axis2/c/core/trunk/src/core/transport/http/common/http_worker.c
axis/axis2/c/core/trunk/util/include/platforms/os400/axutil_os400.h
axis/axis2/c/core/trunk/util/include/platforms/unix/axutil_unix.h
axis/axis2/c/core/trunk/util/include/platforms/windows/axutil_windows.h
axis/axis2/c/core/trunk/util/src/minizip/archive_extract.c
Modified: axis/axis2/c/core/trunk/src/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/common/http_worker.c?rev=961258&r1=961257&r2=961258&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/common/http_worker.c (original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/common/http_worker.c Wed Jul 7 06:59:04 2010
@@ -1062,6 +1062,12 @@ axis2_http_worker_process_request(
axis2_http_status_line_free(tmp_stat_line, env);
tmp_stat_line = NULL;
}
+
+ axis2_engine_free(engine, env);
+ if(fault_ctx)
+ {
+ axis2_msg_ctx_free(fault_ctx, env);
+ }
}
}
else
Modified: axis/axis2/c/core/trunk/util/include/platforms/os400/axutil_os400.h
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/include/platforms/os400/axutil_os400.h?rev=961258&r1=961257&r2=961258&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/include/platforms/os400/axutil_os400.h (original)
+++ axis/axis2/c/core/trunk/util/include/platforms/os400/axutil_os400.h Wed Jul 7 06:59:04 2010
@@ -258,7 +258,11 @@ static int os400_ftime(struct os400_time
/** minizip functions */
#define axis2_fill_win32_filefunc(ffunc)
-#define AXIS2_UNZOPEN2(zipfilename,ffunc) do { unzOpen2(zipfilename,NULL); memset(&ffunc, 0, sizeof(ffunc)); } while (0)
+#define AXIS2_UNZOPEN2(zipfilename, ffunc, uf) \
+ { \
+ uf = unzOpen2(zipfilename,NULL); \
+ memset(&ffunc, 0, sizeof(ffunc)); \
+ }
/**
* handling variable number of arguments (for log.c)
Modified: axis/axis2/c/core/trunk/util/include/platforms/unix/axutil_unix.h
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/include/platforms/unix/axutil_unix.h?rev=961258&r1=961257&r2=961258&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/include/platforms/unix/axutil_unix.h (original)
+++ axis/axis2/c/core/trunk/util/include/platforms/unix/axutil_unix.h Wed Jul 7 06:59:04 2010
@@ -262,7 +262,11 @@ extern "C"
/** minizip functions */
#define axis2_fill_win32_filefunc(ffunc)
-#define AXIS2_UNZOPEN2(zipfilename,ffunc) unzOpen2(zipfilename,NULL); memset(&ffunc, 0, sizeof(ffunc));
+#define AXIS2_UNZOPEN2(zipfilename, ffunc, uf) \
+ { \
+ uf = unzOpen2(zipfilename,NULL); \
+ memset(&ffunc, 0, sizeof(ffunc)); \
+ }
/**
* handling variable number of arguments (for log.c)
Modified: axis/axis2/c/core/trunk/util/include/platforms/windows/axutil_windows.h
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/include/platforms/windows/axutil_windows.h?rev=961258&r1=961257&r2=961258&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/include/platforms/windows/axutil_windows.h (original)
+++ axis/axis2/c/core/trunk/util/include/platforms/windows/axutil_windows.h Wed Jul 7 06:59:04 2010
@@ -255,7 +255,10 @@ extern "C"
* minizip functions
*/
#define axis2_fill_win32_filefunc(ffunc) fill_win32_filefunc(ffunc)
-#define AXIS2_UNZOPEN2(zipfilename,ffunc) unzOpen2(zipfilename,NULL)
+#define AXIS2_UNZOPEN2(zipfilename, ffunc, uf) \
+ { \
+ uf = unzOpen2(zipfilename,NULL); \
+ }
/**
* handling variable number of arguments (for log.c)
Modified: axis/axis2/c/core/trunk/util/src/minizip/archive_extract.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/src/minizip/archive_extract.c?rev=961258&r1=961257&r2=961258&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/src/minizip/archive_extract.c (original)
+++ axis/axis2/c/core/trunk/util/src/minizip/archive_extract.c Wed Jul 7 06:59:04 2010
@@ -267,12 +267,12 @@ aar_extract(
axis2_fill_win32_filefunc(&ffunc);
((void)(ffunc)); /* Just to avoid unused variable warning */
- uf = AXIS2_UNZOPEN2(zipfilename, ffunc);
+ AXIS2_UNZOPEN2(zipfilename, ffunc, uf);
if (uf == NULL)
{
strcat(filename_try, ".zip");
- uf = AXIS2_UNZOPEN2(zipfilename, ffunc);
+ AXIS2_UNZOPEN2(zipfilename, ffunc, uf);
}
}