costin 01/12/15 09:19:26
Modified: jk/native2/include jk_map.h jk_service.h
Log:
Added the 'add' method, to be compatible with apr_tables ( and usable for
storing headers and multi-values ).
Change the storage of headers, attributes to jk_map. This will avoid
copying the data, and provide a simpler interface.
Revision Changes Path
1.5 +3 -3 jakarta-tomcat-connectors/jk/native2/include/jk_map.h
Index: jk_map.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_map.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_map.h 2001/12/14 07:07:11 1.4
+++ jk_map.h 2001/12/15 17:19:26 1.5
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Map object header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#ifndef JK_MAP_H
@@ -90,8 +90,8 @@
const char *name, void *value,
void **oldValue);
- /* int (*add)(struct jk_env *env, struct jk_map *_this, */
- /* const char *name, void *value ); */
+ int (*add)(struct jk_env *env, struct jk_map *_this,
+ const char *name, void *value );
/* Similar with apr_table, elts can be accessed by id
*/
1.6 +8 -21 jakarta-tomcat-connectors/jk/native2/include/jk_service.h
Index: jk_service.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_service.h 2001/12/13 19:06:11 1.5
+++ jk_service.h 2001/12/15 17:19:26 1.6
@@ -63,7 +63,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Dan Milstein <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -185,13 +185,8 @@
*/
int ssl_key_size;
- /*
- * Headers, names and values.
- */
- char **headers_names; /* Names of the request headers */
- char **headers_values; /* Values of the request headers */
- unsigned num_headers; /* Number of request headers */
-
+ /** Incoming headers */
+ struct jk_map *headers_in;
/*
* Request attributes.
@@ -203,9 +198,7 @@
* attributes. Tomcat is required to append org.apache.tomcat. to
* these attrinbute names.
*/
- char **attributes_names; /* Names of the request attributes */
- char **attributes_values; /* Values of the request attributes */
- unsigned num_attributes; /* Number of request attributes */
+ struct jk_map *attributes;
/*
* The jvm route is in use when the adapter load balance among
@@ -220,9 +213,7 @@
*/
int status;
const char *msg;
- unsigned out_headers;
- char **out_header_names;
- char **out_header_values;
+ struct jk_map *headers_out;
/* Count remaining bytes ( original content length minus what was sent */
int left_bytes_to_send;
@@ -243,14 +234,10 @@
void (*afterRequest)( jk_ws_service_t *_this );
/*
- * Send the response headers to the browser.
+ * Set the response head in the server structures. This will be called
+ * before the first write.
*/
- int (JK_METHOD *start_response)(jk_ws_service_t *s,
- int status,
- const char *reason,
- const char * const *header_names,
- const char * const *header_values,
- unsigned num_of_headers);
+ int (JK_METHOD *head)(jk_ws_service_t *s);
/*
* Read a chunk of the request body into a buffer. Attempt to read len
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
