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/08/02 11:19:11 UTC
svn commit: r981427 - in /axis/axis2/c/core/branches/c/1.7.x/1.7.0/c: ./
cutest/include/ src/core/transport/http/common/ test/ test/core/addr/
test/core/clientapi/ test/core/context/ test/core/deployment/
test/core/description/ test/core/engine/ test/c...
Author: damitha
Date: Mon Aug 2 09:19:09 2010
New Revision: 981427
URL: http://svn.apache.org/viewvc?rev=981427&view=rev
Log:
Fixing RC1 bugs as pointed out in the axis-c-dev
Modified:
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/build.sh
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/cutest/include/cut_http_server.h
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/src/core/transport/http/common/http_worker.c
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/addr/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/clientapi/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/context/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/deployment/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/description/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/engine/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/transport/http/Makefile.am
axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/util/test/util/Makefile.am
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/build.sh
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/build.sh?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/build.sh (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/build.sh Mon Aug 2 09:19:09 2010
@@ -7,7 +7,7 @@ export AXIS2C_HOME
echo "AXIS2C_HOME = ${AXIS2C_HOME}"
-sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes
+sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes
make -j 10
make install
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/cutest/include/cut_http_server.h
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/cutest/include/cut_http_server.h?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/cutest/include/cut_http_server.h (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/cutest/include/cut_http_server.h Mon Aug 2 09:19:09 2010
@@ -15,6 +15,9 @@
* limitations under the License.
*/
+#ifndef CUT_HTTP_SERVER_H
+#define CUT_HTTP_SERVER_H
+
#include <axis2_http_server.h>
#include <axis2_http_transport.h>
#include <platforms/axutil_platform_auto_sense.h>
@@ -28,6 +31,11 @@
#include <axutil_file_handler.h>
#include <axis2_const.h>
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
axutil_env_t *system_env = NULL;
axutil_thread_t *td_http_server = NULL;
axis2_transport_receiver_t *server = NULL;
@@ -200,3 +208,8 @@ static void ut_stop_http_server(axutil_e
rv = axutil_thread_exit(thread_http_server, env->allocator);
thread_http_server = NULL;
}
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* CUT_HTTP_SERVER_H */
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/src/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/src/core/transport/http/common/http_worker.c?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/src/core/transport/http/common/http_worker.c (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/src/core/transport/http/common/http_worker.c Mon Aug 2 09:19:09 2010
@@ -242,12 +242,19 @@ axis2_http_worker_process_request(
axis2_char_t *session_id = NULL;
cookie_header_value = axis2_http_header_get_value(cookie_header, env);
- session_id = axis2_http_transport_utils_get_session_id_from_cookie(env,
+ if(cookie_header_value)
+ {
+ session_id = axis2_http_transport_utils_get_session_id_from_cookie(env,
cookie_header_value);
- if(session_id)
- session_str = env->get_session_fn((void *) conf_ctx, session_id);
+ }
+ if(session_id && env->get_session_fn)
+ {
+ session_str = env->get_session_fn((void *) conf_ctx, session_id);
+ }
if(session_str)
- axis2_http_transport_utils_set_session(env, msg_ctx, session_str);
+ {
+ axis2_http_transport_utils_set_session(env, msg_ctx, session_str);
+ }
}
/*connection_header = axis2_http_simple_request_get_first_header(simple_request, env,
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/Makefile.am Mon Aug 2 09:19:09 2010
@@ -1,2 +1,3 @@
TESTS =
SUBDIRS = core
+noinst_HEADERS = cutest/include/cut_defs.h cutest/include/cut_http_server.h
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/addr/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/addr/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/addr/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/addr/Makefile.am Mon Aug 2 09:19:09 2010
@@ -18,5 +18,5 @@ INCLUDES = -I$(CUTEST_HOME)/include \
-I$(top_builddir)/include \
-I ../../../util/include \
-I ../../../axiom/include \
- -I ../../../cutest/include
+ -I ../../cutest/include
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/clientapi/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/clientapi/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/clientapi/Makefile.am Mon Aug 2 09:19:09 2010
@@ -49,5 +49,5 @@ INCLUDES = -I$(CUTEST_HOME)/include \
-I ../../../util/include \
-I ../../../neethi/include \
-I ../../../axiom/include \
- -I ../../../cutest/include
+ -I ../../cutest/include
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/context/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/context/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/context/Makefile.am Mon Aug 2 09:19:09 2010
@@ -19,4 +19,4 @@ INCLUDES = -I$(CUTEST_HOME)/include \
-I$(top_builddir)/src/core/description \
-I ../../../util/include \
-I ../../../axiom/include \
- -I ../../../cutest/include
+ -I ../../cutest/include
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/deployment/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/deployment/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/deployment/Makefile.am Mon Aug 2 09:19:09 2010
@@ -24,4 +24,4 @@ INCLUDES = -I ../../../include \
-I ../../../util/include \
-I ../../../axiom/include \
-I ../../../neethi/include \
- -I ../../../cutest/include
+ -I ../../cutest/include
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/description/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/description/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/description/Makefile.am Mon Aug 2 09:19:09 2010
@@ -23,5 +23,5 @@ INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/core/clientapi \
-I ../../../util/include \
-I ../../../axiom/include \
- -I ../../../cutest/include
+ -I ../../cutest/include
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/engine/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/engine/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/engine/Makefile.am Mon Aug 2 09:19:09 2010
@@ -23,5 +23,5 @@ INCLUDES = -I$(top_builddir)/src/xml/gut
-I ../../../util/include \
-I ../../../axiom/include \
-I ../../../neethi/include \
- -I ../../../cutest/include
+ -I ../../cutest/include
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/transport/http/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/transport/http/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/test/core/transport/http/Makefile.am Mon Aug 2 09:19:09 2010
@@ -19,5 +19,5 @@ INCLUDES = -I$(CUTEST_HOME)/include \
-I$(top_builddir)/include \
-I ../../../../util/include \
-I ../../../../axiom/include \
- -I ../../../../cutest/include
+ -I ../../../cutest/include
Modified: axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/util/test/util/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/util/test/util/Makefile.am?rev=981427&r1=981426&r2=981427&view=diff
==============================================================================
--- axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/util/test/util/Makefile.am (original)
+++ axis/axis2/c/core/branches/c/1.7.x/1.7.0/c/util/test/util/Makefile.am Mon Aug 2 09:19:09 2010
@@ -15,4 +15,6 @@ test_thread_LDADD = $(top_builddir)/s
INCLUDES = -I$(top_builddir)/include \
-I$(CUTEST_HOME)/include \
- -I ../../../cutest/include
+ -I ../../../test/cutest/include
+
+EXTRA_DIST = test_string.c