[wsf-c-dev] svn commit r347 - wsf/php/src
svn at wso2.com
svn at wso2.com
Sun Jan 7 22:55:35 PST 2007
Author: nandika
Date: Sun Jan 7 22:55:27 2007
New Revision: 347
Modified:
wsf/php/src/out_transport_info.c
wsf/php/src/stream.c
wsf/php/src/util.c
wsf/php/src/worker.c
wsf/php/src/wsf.c
wsf/php/src/wsf_common.h
wsf/php/src/wsf_out_transport_info.h
wsf/php/src/wsf_stream.h
wsf/php/src/wsf_worker.h
wsf/php/src/wsf_xml_msg_recv.h
wsf/php/src/xml_msg_recv.c
Log:
ops struct removed from wsf_worker
Modified: wsf/php/src/out_transport_info.c
==============================================================================
--- wsf/php/src/out_transport_info.c (original)
+++ wsf/php/src/out_transport_info.c Sun Jan 7 22:55:27 2007
@@ -37,17 +37,17 @@
((ws_out_transport_info_impl_t *)(out_transport_info))
/***************************** Function headers *******************************/
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
axis2_http_out_transport_info_set_content_type
(axis2_http_out_transport_info_t *info, const axis2_env_t *env,
const axis2_char_t *content_type);
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
axis2_http_out_transport_info_set_char_encoding
(axis2_http_out_transport_info_t *info, const axis2_env_t *env,
const axis2_char_t *encoding);
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
axis2_http_out_transport_info_free
(axis2_http_out_transport_info_t *out_transport_info,
const axis2_env_t *env);
@@ -56,7 +56,7 @@
/***************************** End of function headers ************************/
-axis2_http_out_transport_info_t * WS_CALL
+axis2_http_out_transport_info_t * WSF_CALL
ws_out_transport_info_create(const axis2_env_t *env,
php_req_info_t *request)
{
@@ -94,7 +94,7 @@
}
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
axis2_http_out_transport_info_free (axis2_http_out_transport_info_t *info,
const axis2_env_t *env)
{
@@ -114,7 +114,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
ws_out_transport_info_free_void_arg (void *transport_info,
const axis2_env_t *env)
{
@@ -125,7 +125,7 @@
return axis2_http_out_transport_info_free(transport_info_l, env);
}
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
axis2_http_out_transport_info_set_content_type
(axis2_http_out_transport_info_t *info, const axis2_env_t *env,
const axis2_char_t *content_type)
@@ -154,7 +154,7 @@
}
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
axis2_http_out_transport_info_set_char_encoding
(axis2_http_out_transport_info_t *info, const axis2_env_t *env,
const axis2_char_t *encoding)
Modified: wsf/php/src/stream.c
==============================================================================
--- wsf/php/src/stream.c (original)
+++ wsf/php/src/stream.c Sun Jan 7 22:55:27 2007
@@ -34,37 +34,37 @@
#define AXIS2_INTF_TO_IMPL(stream) ((ws_stream_impl_t *)(stream))
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
ws_stream_free (
axis2_stream_t *stream,
const axis2_env_t *env);
-axis2_stream_type_t WS_CALL
+axis2_stream_type_t WSF_CALL
ws_stream_get_type(
axis2_stream_t *stream,
const axis2_env_t *env);
-int WS_CALL
+int WSF_CALL
ws_stream_write(
axis2_stream_t *stream,
const axis2_env_t *env,
const void *buffer,
size_t count);
-int WS_CALL
+int WSF_CALL
ws_stream_read(
axis2_stream_t *stream,
const axis2_env_t *env,
void *buffer,
size_t count);
-int WS_CALL
+int WSF_CALL
ws_stream_skip(
axis2_stream_t *stream,
const axis2_env_t *env,
int count);
-WSF_PHP_API axis2_stream_t * WS_CALL
+WSF_PHP_API axis2_stream_t * WSF_CALL
axis2_stream_create_php(const axis2_env_t *env,
php_req_info_t *req_info TSRMLS_DC)
{
@@ -108,7 +108,7 @@
return &(stream_impl->stream);
}
-axis2_status_t WS_CALL
+axis2_status_t WSF_CALL
ws_stream_free (
axis2_stream_t *stream,
const axis2_env_t *env)
@@ -129,7 +129,7 @@
return AXIS2_SUCCESS;
}
-axis2_stream_type_t WS_CALL
+axis2_stream_type_t WSF_CALL
ws_stream_get_type (axis2_stream_t *stream,
const axis2_env_t *env)
{
@@ -137,11 +137,11 @@
return AXIS2_INTF_TO_IMPL(stream)->stream_type;
}
-int WS_CALL
+int WSF_CALL
ws_stream_write(axis2_stream_t *stream, const axis2_env_t *env,const void *buf, size_t count){
return -1;
}
-int WS_CALL
+int WSF_CALL
ws_stream_read(axis2_stream_t *stream,
const axis2_env_t *env,
void *buffer,
@@ -173,7 +173,7 @@
}
}
-int WS_CALL
+int WSF_CALL
ws_stream_skip(axis2_stream_t *stream,
const axis2_env_t *env,
int count)
Modified: wsf/php/src/util.c
==============================================================================
--- wsf/php/src/util.c (original)
+++ wsf/php/src/util.c Sun Jan 7 22:55:27 2007
@@ -319,7 +319,7 @@
return;
}
- conf_ctx = WS_WORKER_GET_CONF_CTX(svc_info->php_worker , env);
+ conf_ctx = wsf_worker_get_conf_ctx(svc_info->php_worker , env);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if(!conf){
@@ -370,7 +370,7 @@
AXIS2_OP_SET_MSG_RECV(op, env, svc_info->msg_recv);
- conf_ctx = WS_WORKER_GET_CONF_CTX(svc_info->php_worker , env);
+ conf_ctx = wsf_worker_get_conf_ctx(svc_info->php_worker , env);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
Modified: wsf/php/src/worker.c
==============================================================================
--- wsf/php/src/worker.c (original)
+++ wsf/php/src/worker.c Sun Jan 7 22:55:27 2007
@@ -34,116 +34,94 @@
#define READ_SIZE 32
-typedef struct ws_worker_impl ws_worker_impl_t;
-
-struct ws_worker_impl
+struct wsf_worker_t
{
- ws_worker_t php_worker;
axis2_conf_ctx_t *conf_ctx;
};
-#define AXIS2_INTF_TO_IMPL(php_worker) ((ws_worker_impl_t *)\
- (php_worker))
-
-int WS_CALL
-ws_worker_process_request(
- ws_worker_t *php_worker,
- const axis2_env_t *env,
- php_req_info_t *req,
- ws_svc_info_t *svc_info);
-
-WSF_PHP_API axis2_char_t* WS_CALL
-ws_worker_get_bytes(
- const axis2_env_t *env,
- axis2_stream_t *stream);
-
-axis2_status_t WS_CALL
-ws_worker_free(
- ws_worker_t *php_worker,
- const axis2_env_t *env);
-
-axis2_conf_ctx_t* WS_CALL
-ws_worker_get_conf_ctx(
- ws_worker_t *php_worker,
- const axis2_env_t *env);
-
-
-WSF_PHP_API ws_worker_t * WS_CALL
-ws_worker_create (const axis2_env_t *env,
- axis2_char_t *repo_path)
+wsf_worker_t * wsf_worker_create (const axis2_env_t *env,
+ axis2_char_t *repo_path)
{
- ws_worker_impl_t *php_worker_impl = NULL;
+ wsf_worker_t *worker = NULL;
AXIS2_ENV_CHECK(env, NULL);
- php_worker_impl = (ws_worker_impl_t *)
- AXIS2_MALLOC (env->allocator, sizeof(ws_worker_impl_t));
-
- if(NULL == php_worker_impl) {
+
+ worker = (wsf_worker_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(wsf_worker_t));
+ if(!worker)
+ {
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
- php_worker_impl->php_worker.ops = NULL;
- php_worker_impl->conf_ctx = NULL;
-
- php_worker_impl->conf_ctx = build_conf_ctx(env, repo_path);
-
- if(NULL == php_worker_impl->conf_ctx) {
- ws_worker_free((ws_worker_t*)php_worker_impl, env);
+ worker->conf_ctx = NULL;
+ worker->conf_ctx = build_conf_ctx(env, repo_path);
+
+ if(NULL == worker->conf_ctx) {
+ wsf_worker_free(worker, env);
return NULL;
}
- php_worker_impl->php_worker.ops = AXIS2_MALLOC(env->allocator,
- sizeof(ws_worker_ops_t));
-
- if(NULL == php_worker_impl->php_worker.ops) {
- ws_worker_free((ws_worker_t*)php_worker_impl,
- env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
+ return worker;
+}
+
+axis2_char_t* wsf_worker_get_bytes(const axis2_env_t *env,
+ axis2_stream_t *stream)
+{
- php_worker_impl->php_worker.ops->process_request =
- ws_worker_process_request;
- php_worker_impl->php_worker.ops->free_fn =
- ws_worker_free;
- php_worker_impl->php_worker.ops->get_conf_ctx =
- ws_worker_get_conf_ctx;
+ axis2_stream_t *tmp_stream = NULL;
+ int return_size = -1;
+ axis2_char_t *buffer = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK(env->error, stream, NULL);
+
+ tmp_stream = axis2_stream_create_basic(env);
+ while(1) {
+ int read = 0;
+ int write = 0;
+
+ char buf[READ_SIZE];
+ read = AXIS2_STREAM_READ(stream, env, buf, READ_SIZE);
+ if(read < 0) {
+ break;
+ }
+ write = AXIS2_STREAM_WRITE(tmp_stream, env, buf, read);
+ if(read < (READ_SIZE -1)) {
+ break;
+ }
+ }
+ return_size = AXIS2_STREAM_BASIC_GET_LEN(tmp_stream, env);
- return &(php_worker_impl->php_worker);
+ if(return_size > 0) {
+ buffer = (char *)AXIS2_MALLOC(env->allocator, sizeof(char)*
+ (return_size +2));
+ return_size = AXIS2_STREAM_READ(tmp_stream, env, buffer,
+ return_size + 1);
+ buffer[return_size + 1] = '\0';
+ }
+ AXIS2_STREAM_FREE(tmp_stream, env);
+ return buffer;
}
-axis2_status_t WS_CALL
-ws_worker_free (ws_worker_t *php_worker,
+void wsf_worker_free(wsf_worker_t *worker,
const axis2_env_t *env)
{
- ws_worker_impl_t *worker_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- worker_impl = AXIS2_INTF_TO_IMPL(php_worker);
- if(worker_impl->conf_ctx != NULL) {
- /*
- AXIS2_CONF_CTX_FREE(worker_impl->conf_ctx, env);
- worker_impl->conf_ctx = NULL;
- */
- }
- if (NULL != php_worker->ops){
- /*
- AXIS2_FREE(env->allocator, php_worker->ops);
- */
- }
- AXIS2_FREE(env->allocator, worker_impl);
- return AXIS2_SUCCESS;
+ if(!worker)
+ return;
+ if(worker->conf_ctx != NULL) {
+ /*
+ AXIS2_CONF_CTX_FREE(worker->conf_ctx, env);
+ worker->conf_ctx = NULL;
+ */
+ }
+ AXIS2_FREE(env->allocator, worker);
}
-int WS_CALL
-ws_worker_process_request(
- ws_worker_t *php_worker,
+int wsf_worker_process_request(
+ wsf_worker_t *worker,
const axis2_env_t *env,
php_req_info_t *request,
ws_svc_info_t *svc_info)
{
- ws_worker_impl_t *php_worker_impl = NULL;
-
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
axis2_op_ctx_t *op_ctx = NULL;
@@ -178,14 +156,11 @@
axis2_char_t *is_class = NULL;
TSRMLS_FETCH();
-
- AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
+
AXIS2_PARAM_CHECK(env->error, request, AXIS2_CRITICAL_FAILURE);
- php_worker_impl = AXIS2_INTF_TO_IMPL(php_worker);
- conf_ctx = php_worker_impl->conf_ctx;
- url = axis2_url_create(env, "http",
- request->svr_name,
+ conf_ctx = worker->conf_ctx;
+ url = axis2_url_create(env, "http", request->svr_name,
request->svr_port, request->request_uri);
if(NULL == conf_ctx) {
@@ -216,11 +191,10 @@
transport_qname = axis2_qname_create(env, AXIS2_TRANSPORT_HTTP, NULL,
NULL);
out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(AXIS2_CONF_CTX_GET_CONF
- (php_worker_impl->conf_ctx, env), env,
- transport_qname);
+ (worker->conf_ctx, env), env, transport_qname);
+
in_desc = AXIS2_CONF_GET_TRANSPORT_IN(AXIS2_CONF_CTX_GET_CONF
- (php_worker_impl->conf_ctx, env), env,
- transport_qname);
+ (worker->conf_ctx, env), env, transport_qname);
AXIS2_QNAME_FREE(transport_qname, env);
@@ -231,51 +205,54 @@
AXIS2_MSG_CTX_SET_SVC(msg_ctx, env, svc_info->svc);
/** create transport out description */
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_stream_free_void_arg);
- AXIS2_PROPERTY_SET_VALUE(property, env, out_stream);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_OUT, property,
- AXIS2_FALSE);
-
+ {
+ axis2_property_t *out_stream_prop = NULL;
+
+ out_stream_prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ axis2_stream_free_void_arg, out_stream);
+
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_OUT,
+ out_stream_prop, AXIS2_FALSE);
+ }
/** generate uuid for context */
ctx_uuid = axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, ctx_uuid);
AXIS2_FREE(env->allocator, ctx_uuid);
/** create transport in description */
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
- ws_out_transport_info_free_void_arg);
- php_out_transport_info = ws_out_transport_info_create(env, request);
- AXIS2_PROPERTY_SET_VALUE(property, env, php_out_transport_info);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
- property, AXIS2_FALSE);
+ {
+ axis2_property_t *trns_in_desc_prop = NULL;
+ php_out_transport_info = ws_out_transport_info_create(env, request);
+ trns_in_desc_prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ ws_out_transport_info_free_void_arg, php_out_transport_info);
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
+ trns_in_desc_prop, AXIS2_FALSE);
+ }
- /* serivce path */
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(svc_info->svc_path, env));
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, "WS_SVC_PATH", property,
- AXIS2_FALSE);
-
+ /* service path */
+ {
+ axis2_property_t *svc_path_prop = NULL;
+ svc_path_prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ NULL, AXIS2_STRDUP(svc_info->svc_path, env));
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, "WS_SVC_PATH", svc_path_prop, AXIS2_FALSE);
+ }
if(request->transfer_encoding){
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(request->transfer_encoding, env));
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING, property,
- AXIS2_FALSE);
+ axis2_property_t *tns_enc_prop = NULL;
+ tns_enc_prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ NULL, AXIS2_STRDUP(request->transfer_encoding, env));
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
+ tns_enc_prop, AXIS2_FALSE);
}
- /** store svc_info struct as a property */
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, svc_info);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, WS_SVC_INFO, property,
- AXIS2_FALSE);
-
+ /** store svc_info struct as a property */
+ {
+ axis2_property_t *svc_info_prop = NULL;
+ svc_info_prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ NULL, svc_info);
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, WS_SVC_INFO,
+ svc_info_prop, AXIS2_FALSE);
+ }
/** use MTOM property */
if(svc_info->use_mtom == 1){
axis2_property_t *mtom_property = axis2_property_create(env);
@@ -376,7 +353,7 @@
}
fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
- body_string = ws_worker_get_bytes(env, out_stream);
+ body_string = wsf_worker_get_bytes(env, out_stream);
send_status = WS_HTTP_INTERNAL_SERVER_ERROR;
if(NULL != body_string){
request->result_payload = body_string;
@@ -418,53 +395,12 @@
send_status = WS_HTTP_ACCEPTED;
}
}
-
return send_status;
}
-WSF_PHP_API axis2_char_t* WS_CALL
-ws_worker_get_bytes(const axis2_env_t *env,
- axis2_stream_t *stream)
-{
-
- axis2_stream_t *tmp_stream = NULL;
- int return_size = -1;
- axis2_char_t *buffer = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, stream, NULL);
-
- tmp_stream = axis2_stream_create_basic(env);
- while(1) {
- int read = 0;
- int write = 0;
-
- char buf[READ_SIZE];
- read = AXIS2_STREAM_READ(stream, env, buf, READ_SIZE);
- if(read < 0) {
- break;
- }
- write = AXIS2_STREAM_WRITE(tmp_stream, env, buf, read);
- if(read < (READ_SIZE -1)) {
- break;
- }
- }
- return_size = AXIS2_STREAM_BASIC_GET_LEN(tmp_stream, env);
-
- if(return_size > 0) {
- buffer = (char *)AXIS2_MALLOC(env->allocator, sizeof(char)*
- (return_size +2));
- return_size = AXIS2_STREAM_READ(tmp_stream, env, buffer,
- return_size + 1);
- buffer[return_size + 1] = '\0';
- }
- AXIS2_STREAM_FREE(tmp_stream, env);
- return buffer;
-}
-axis2_conf_ctx_t* WS_CALL
-ws_worker_get_conf_ctx(ws_worker_t *php_worker,
+axis2_conf_ctx_t* wsf_worker_get_conf_ctx(wsf_worker_t *worker,
const axis2_env_t *env)
{
- return AXIS2_INTF_TO_IMPL(php_worker)->conf_ctx;
+ return worker->conf_ctx;
}
Modified: wsf/php/src/wsf.c
==============================================================================
--- wsf/php/src/wsf.c (original)
+++ wsf/php/src/wsf.c Sun Jan 7 22:55:27 2007
@@ -44,7 +44,7 @@
/* True global values, worker is thread safe */
static axis2_env_t *env;
static axis2_env_t *ws_env_svr;
-static ws_worker_t *worker;
+static wsf_worker_t *worker;
/** WSMessage functions */
PHP_METHOD(ws_message, __construct);
@@ -207,38 +207,38 @@
static void ws_env_free(axis2_env_t *env);
/* {{{ malloc wrapper */
-static void* WS_CALL ws_malloc_wrapper(axis2_allocator_t *allocator, size_t size)
+static void* WSF_CALL ws_malloc_wrapper(axis2_allocator_t *allocator, size_t size)
{
return pemalloc(size,1);
}
/* }}} */
/* {{{ realloc wrapper */
-static void* WS_CALL ws_realloc_warpper(axis2_allocator_t *allocator,void *ptr, size_t size)
+static void* WSF_CALL ws_realloc_warpper(axis2_allocator_t *allocator,void *ptr, size_t size)
{
return perealloc(ptr, size, 1);
}
/* }}} */
/* {{{ free wrapper */
-static void WS_CALL ws_free_wrapper(axis2_allocator_t *allocator, void *ptr)
+static void WSF_CALL ws_free_wrapper(axis2_allocator_t *allocator, void *ptr)
{
if (ptr)
pefree(ptr, 1);
}
/* }}} */
/* {{{ malloc wrapper */
-static void* WS_CALL ws_malloc_wrapper_cli(axis2_allocator_t *allocator, size_t size)
+static void* WSF_CALL ws_malloc_wrapper_cli(axis2_allocator_t *allocator, size_t size)
{
return emalloc(size);
}
/* }}} */
/* {{{ realloc wrapper */
-static void* WS_CALL ws_realloc_warpper_cli(axis2_allocator_t *allocator,void *ptr, size_t size)
+static void* WSF_CALL ws_realloc_warpper_cli(axis2_allocator_t *allocator,void *ptr, size_t size)
{
return erealloc(ptr, size);
}
/* }}} */
/* {{{ free wrapper */
-static void WS_CALL ws_free_wrapper_cli(axis2_allocator_t *allocator, void *ptr)
+static void WSF_CALL ws_free_wrapper_cli(axis2_allocator_t *allocator, void *ptr)
{
efree(ptr);
}
@@ -546,7 +546,7 @@
if (WSF_GLOBAL(home))
home_folder = WSF_GLOBAL(home);
- worker = ws_worker_create(env, home_folder);
+ worker = wsf_worker_create(env, home_folder);
axiom_xml_reader_init();
return SUCCESS;
@@ -1937,7 +1937,7 @@
ws_svc_info_t *svc_info = NULL;
php_req_info_t *req_info = NULL;
zval **server_vars, **data;
- ws_worker_t *php_worker = NULL;
+ wsf_worker_t *php_worker = NULL;
zval **raw_post;
int status = 0;
char *response_str = NULL;
@@ -1951,7 +1951,7 @@
svc_info = (ws_svc_info_t *)(intern->ptr);
php_worker = svc_info->php_worker;
- conf_ctx = WS_WORKER_GET_CONF_CTX(php_worker, env);
+ conf_ctx = wsf_worker_get_conf_ctx(php_worker, env);
if(!conf_ctx) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "conf ctx missing");
return;
@@ -2131,7 +2131,7 @@
}
}
}
- status = WS_WORKER_PROCESS_REQUEST(php_worker, env, req_info, svc_info);
+ status = wsf_worker_process_request(php_worker, env, req_info, svc_info);
if(status == WS_HTTP_ACCEPTED){
sprintf(status_line, "%s 202 Accepted", req_info->http_protocol);
sapi_add_header(status_line, strlen(status_line), 1);
Modified: wsf/php/src/wsf_common.h
==============================================================================
--- wsf/php/src/wsf_common.h (original)
+++ wsf/php/src/wsf_common.h Sun Jan 7 22:55:27 2007
@@ -24,9 +24,9 @@
#endif
#ifdef PHP_WIN32
-#define WS_CALL __stdcall
+#define WSF_CALL __stdcall
#else
-#define WS_CALL
+#define WSF_CALL
#endif
#include <axis2_svc.h>
#include <axis2_msg_recv.h>
@@ -181,7 +181,7 @@
axis2_svc_t *svc;
axis2_msg_recv_t *msg_recv;
axis2_hash_t *class_info;
- struct ws_worker *php_worker;
+ struct wsf_worker *php_worker;
axis2_hash_t *ops_to_actions;
axis2_hash_t *ops_to_functions;
Modified: wsf/php/src/wsf_out_transport_info.h
==============================================================================
--- wsf/php/src/wsf_out_transport_info.h (original)
+++ wsf/php/src/wsf_out_transport_info.h Sun Jan 7 22:55:27 2007
@@ -25,11 +25,11 @@
{
#endif
-WSF_PHP_API axis2_http_out_transport_info_t * WS_CALL
+WSF_PHP_API axis2_http_out_transport_info_t * WSF_CALL
ws_out_transport_info_create(const axis2_env_t *env,
php_req_info_t *r);
-WSF_PHP_API axis2_status_t WS_CALL
+WSF_PHP_API axis2_status_t WSF_CALL
ws_out_transport_info_free_void_arg (void *transport_info,
const axis2_env_t *env);
Modified: wsf/php/src/wsf_stream.h
==============================================================================
--- wsf/php/src/wsf_stream.h (original)
+++ wsf/php/src/wsf_stream.h Sun Jan 7 22:55:27 2007
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef WS_STREAM_H
-#define WS_STREAM_H
+#ifndef WSF_STREAM_H
+#define WSF_STREAM_H
#include "wsf_common.h"
#include <axis2_stream.h>
@@ -26,7 +26,7 @@
{
#endif
-WSF_PHP_API axis2_stream_t * WS_CALL
+WSF_PHP_API axis2_stream_t * WSF_CALL
axis2_stream_create_php(const axis2_env_t *env,
php_req_info_t *req TSRMLS_DC);
@@ -34,5 +34,5 @@
}
#endif
-#endif /* WS_STREAM_H */
+#endif /* WSF_STREAM_H */
Modified: wsf/php/src/wsf_worker.h
==============================================================================
--- wsf/php/src/wsf_worker.h (original)
+++ wsf/php/src/wsf_worker.h Sun Jan 7 22:55:27 2007
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef WS_WORKER_H
-#define WS_WORKER_H
+#ifndef WSF_WORKER_H
+#define WSF_WORKER_H
#include <axis2_const.h>
#include <axis2_defines.h>
@@ -28,48 +28,20 @@
extern "C"
#endif
-typedef struct ws_worker_ops ws_worker_ops_t;
-typedef struct ws_worker ws_worker_t;
+typedef struct wsf_worker_t wsf_worker_t;
-struct ws_worker_ops
-{
- int (WS_CALL *process_request)
- (ws_worker_t *php_worker,
- const axis2_env_t *env,
- php_req_info_t *req,
- ws_svc_info_t *svc_info);
-
- axis2_status_t (WS_CALL *free_fn)
- (ws_worker_t *php_worker,
- const axis2_env_t *env);
-
- axis2_conf_ctx_t* (WS_CALL *get_conf_ctx)
- (ws_worker_t *php_worker,
- const axis2_env_t *env);
-};
-
-
-struct ws_worker
-{
- ws_worker_ops_t *ops;
-};
-
-
-WSF_PHP_API ws_worker_t * WS_CALL
-ws_worker_create (const axis2_env_t *env,
- axis2_char_t *repo_path);
-
-#define WS_WORKER_PROCESS_REQUEST(php_worker, env, request, svc_info) \
- ((php_worker)->ops->process_request(php_worker, env, request, svc_info ))
-#define WS_WORKER_FREE(php_worker, env) \
- ((php_worker)->ops->free_fn(php_worker, env))
+wsf_worker_t* wsf_worker_create (const axis2_env_t *env, axis2_char_t *repo_path);
-#define WS_WORKER_GET_CONF_CTX(php_worker, env) \
- ((php_worker)->ops->get_conf_ctx(php_worker, env))
+int wsf_worker_process_request(wsf_worker_t *worker, const axis2_env_t *env,
+ php_req_info_t *reqinfo, ws_svc_info_t *svc_info);
+
+void wsf_worker_free(wsf_worker_t *worker, const axis2_env_t *env);
+
+axis2_conf_ctx_t* wsf_worker_get_conf_ctx(wsf_worker_t *worker, const axis2_env_t *env);
#ifdef __cplusplus
}
#endif
-#endif /* WS_WORKER_H */
+#endif /* WSF_WORKER_H */
Modified: wsf/php/src/wsf_xml_msg_recv.h
==============================================================================
--- wsf/php/src/wsf_xml_msg_recv.h (original)
+++ wsf/php/src/wsf_xml_msg_recv.h Sun Jan 7 22:55:27 2007
@@ -19,7 +19,7 @@
#include "wsf_common.h"
-WSF_PHP_API axis2_msg_recv_t* WS_CALL
+WSF_PHP_API axis2_msg_recv_t* WSF_CALL
ws_xml_msg_recv_create(const axis2_env_t *env);
#endif /* WS_XML_MSG_RECV_H */
Modified: wsf/php/src/xml_msg_recv.c
==============================================================================
--- wsf/php/src/xml_msg_recv.c (original)
+++ wsf/php/src/xml_msg_recv.c Sun Jan 7 22:55:27 2007
@@ -99,7 +99,7 @@
/************************** End of function prototypes ************************/
-WSF_PHP_API axis2_msg_recv_t* WS_CALL
+WSF_PHP_API axis2_msg_recv_t* WSF_CALL
ws_xml_msg_recv_create(const axis2_env_t *env){
axis2_msg_recv_t *msg_recv = NULL;
More information about the Wsf-c-dev
mailing list