Author: chrisz
Date: Tue Oct 17 18:42:27 2006
New Revision: 5815
Modified:
Webware/trunk/Docs/ReleaseProcedures.phtml
Webware/trunk/WebKit/Adapters/mod_webkit/mod_webkit.c
Webware/trunk/WebKit/Adapters/mod_webkit2/mod_webkit.c
Log:
Code cosmetics in mod_webkit.
Modified: Webware/trunk/Docs/ReleaseProcedures.phtml
==============================================================================
--- Webware/trunk/Docs/ReleaseProcedures.phtml (original)
+++ Webware/trunk/Docs/ReleaseProcedures.phtml Tue Oct 17 18:42:27 2006
@@ -53,7 +53,8 @@
[ ] Make sure that mod_webkit, mod_webkit2 and all other important components
can be compiled, linked and used without problems. If mod_webkit or
- mod_webkit2 have changed, provide a new mod_webkit.dll for Windows users.
+ mod_webkit2 have changed, provide a new mod_webkit.dll for Windows users
+ and adjust the version number in mod_webkit.c to the Webware version.
</pre>
Modified: Webware/trunk/WebKit/Adapters/mod_webkit/mod_webkit.c
==============================================================================
--- Webware/trunk/WebKit/Adapters/mod_webkit/mod_webkit.c (original)
+++ Webware/trunk/WebKit/Adapters/mod_webkit/mod_webkit.c Tue Oct 17 18:42:27 2006
@@ -4,6 +4,8 @@
* Author: Jay Love (jsliv@...) *
**************************************************************/
+#define VERSION_COMPONENT "mod_webkit2/0.9.3"
+
#include "mod_webkit.h"
/*
@@ -38,7 +40,7 @@
} wkcfg;
/*A quick logging macro */
-#define log_error(message,server) ap_log_error(APLOG_MARK, APLOG_ERR, server, message)
+#define log_error(message, server) ap_log_error(APLOG_MARK, APLOG_ERR, server, message)
/*
* Declare ourselves so the configuration routines can find and know us.
@@ -76,7 +78,7 @@
/* If we found also characters we use gethostbyname()*/
struct hostent *host;
- host=gethostbyname(value);
+ host = gethostbyname(value);
if (host == NULL) return 0;
return ((struct in_addr *)host->h_addr_list[0])->s_addr;
} else {
@@ -242,14 +244,14 @@
addr.sin_family = AF_INET;
/* Open the socket */
- sock=ap_psocket(r->pool, AF_INET, SOCK_STREAM, 0);
- if (sock==-1) {
+ sock = ap_psocket(r->pool, AF_INET, SOCK_STREAM, 0);
+ if (sock == -1) {
return -1;
}
/* Tries to connect to appserver (continues trying while error is EINTR) */
do {
- ret = connect(sock,(struct sockaddr *)&addr,sizeof(struct sockaddr_in));
+ ret = connect(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
#ifdef WIN32
if (ret == SOCKET_ERROR) errno = WSAGetLastError() - WSABASEERR;
#endif /* WIN32 */
@@ -299,16 +301,16 @@
* and we don't want to accidentally submit the same request twice.
*/
- log_debug("creating buffsocket",r);
- buffsocket=ap_bcreate(r->pool,B_SOCKET+B_RDWR);
+ log_debug("creating buffsocket", r);
+ buffsocket = ap_bcreate(r->pool, B_SOCKET+B_RDWR);
- log_debug("push socket into fd",r);
- ap_bpushfd(buffsocket,sock,sock);
+ log_debug("push socket into fd", r);
+ ap_bpushfd(buffsocket, sock, sock);
/* Now we send the request to the AppServer */
- log_debug("writing request to buff",r);
+ log_debug("writing request to buff", r);
bs = ap_bwrite(buffsocket, int_dict->str, int_dict->ptr - int_dict->str);
- bs = ap_bwrite(buffsocket,whole_dict->str,length);
+ bs = ap_bwrite(buffsocket, whole_dict->str, length);
/* Now we pump through any client input. */
if ((ret = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != 0)
@@ -320,8 +322,8 @@
int retry = 0;
while ((n = ap_get_client_block(r, buff, MAX_STRING_LEN)) > 0) {
- retry=0;
- sent=0;
+ retry = 0;
+ sent = 0;
while (retry < 10) {
sent = sent + ap_bwrite(buffsocket, buff+sent, n-sent);
if (sent < n) {
@@ -351,12 +353,12 @@
ap_kill_timeout(r);
/* Now we get the response from the AppServer */
- ap_hard_timeout("wk_read",r);
+ ap_hard_timeout("wk_read", r);
- log_debug("scanning for headers",r);
+ log_debug("scanning for headers", r);
/* pull out headers */
- if ((ret=ap_scan_script_header_err_buff(r, buffsocket, NULL))) {
- if(ret>=500 || ret < 0) {
+ if ((ret = ap_scan_script_header_err_buff(r, buffsocket, NULL))) {
+ if (ret >= 500 || ret < 0) {
log_error("cannot scan servlet headers ", r->server);
return 2;
}
@@ -376,7 +378,7 @@
/* Kill timeouts, close buffer and socket and return */
ap_kill_timeout(r);
- log_debug("closing buffsocket",r);
+ log_debug("closing buffsocket", r);
ap_bclose(buffsocket);
log_debug("Done", r);
@@ -402,11 +404,11 @@
{
long length;
wkcfg *cfg;
- WFILE* env_dict=NULL;
+ WFILE* env_dict = NULL;
int i;
char msgbuf[MAX_STRING_LEN];
int conn_attempt = 0;
- WFILE* whole_dict=NULL;
+ WFILE* whole_dict = NULL;
WFILE* int_dict = NULL;
const char *value;
const char *key;
@@ -446,7 +448,7 @@
key = elts[i].key;
value = ap_table_get(r->subprocess_env, elts[i].key);
write_string(key, env_dict);
- if (value !=NULL)
+ if (value != NULL)
write_string(value, env_dict);
else
w_byte(TYPE_NONE, env_dict);
@@ -507,7 +509,7 @@
write_integer((int)length, int_dict);
/* now we try to send it */
- for (conn_attempt = 1; conn_attempt<=cfg->retryattempts; conn_attempt++) {
+ for (conn_attempt = 1; conn_attempt <= cfg->retryattempts; conn_attempt++) {
int result = transact_with_app_server(r, cfg, whole_dict, int_dict, length);
if (result == 0) {
return OK;
@@ -541,7 +543,7 @@
#if MODULE_MAGIC_NUMBER >= 19980527
/* Tell apache we're here */
- ap_add_version_component("mod_webkit/0.9.1");
+ ap_add_version_component(VERSION_COMPONENT);
#endif
}
@@ -622,7 +624,7 @@
static const handler_rec webkit_handlers[] =
{
{"webkit-handler", content_handler},
- {"psp-handler",psp_handler},
+ {"psp-handler", psp_handler},
{NULL}
};
Modified: Webware/trunk/WebKit/Adapters/mod_webkit2/mod_webkit.c
==============================================================================
--- Webware/trunk/WebKit/Adapters/mod_webkit2/mod_webkit.c (original)
+++ Webware/trunk/WebKit/Adapters/mod_webkit2/mod_webkit.c Tue Oct 17 18:42:27 2006
@@ -4,6 +4,8 @@
* Author: Jay Love (jsliv@...) *
**************************************************************/
+#define VERSION_COMPONENT "mod_webkit2/0.9.3"
+
#include "mod_webkit.h"
#include "http_config.h"
#include "http_core.h"
@@ -50,7 +52,7 @@
} wkcfg;
/* Use to log errors */
-#define log_error(message,server) ap_log_error(APLOG_MARK, APLOG_ERR, 0, server, message)
+#define log_error(message, server) ap_log_error(APLOG_MARK, APLOG_ERR, 0, server, message)
/*
* Declare ourselves so the configuration routines can find and know us.
@@ -169,7 +171,7 @@
cfg->port = 8086;
cfg->host = "localhost";
- cfg->apraddr=NULL;
+ cfg->apraddr = NULL;
cfg->retryattempts = 10;
cfg->retrydelay = 1;
cfg->passheaders = apr_array_make(p, 1, sizeof(char *));
@@ -183,17 +185,17 @@
//cfg->addr = resolve_host(cfg->host);
- rv=apr_sockaddr_info_get(&apraddr, cfg->host,APR_UNSPEC, cfg->port, 0, p);
+ rv = apr_sockaddr_info_get(&apraddr, cfg->host, APR_UNSPEC, cfg->port, 0, p);
/*
* Now fill in the defaults. If there are any `parent' configuration
* records, they'll get merged as part of a separate callback.
*/
if (rv != APR_SUCCESS){
- log_error("couldn't resolve WKServer address",NULL);
+ log_error("couldn't resolve WKServer address", NULL);
}
- cfg->apraddr=apraddr;
+ cfg->apraddr = apraddr;
return (void *) cfg;
}
@@ -242,7 +244,7 @@
APR_PROTO_TCP,
#endif
r->pool)) != APR_SUCCESS) {
- log_error("Failure creating socket for appserver connection",r->server);
+ log_error("Failure creating socket for appserver connection", r->server);
return NULL;
}
@@ -315,7 +317,7 @@
const char *location;
char sbuf[MAX_STRING_LEN];
- log_debug("In transact_with_appserver",r);
+ log_debug("In transact_with_appserver", r);
aprsock = wksock_open(r, cfg->addr, cfg->port, cfg);
if (aprsock == NULL) return 1;
@@ -330,7 +332,7 @@
aprlen = int_dict->ptr - int_dict->str;
rv = apr_socket_send(aprsock, int_dict->str, &aprlen);
aprlen = length;
- rv = apr_socket_send(aprsock,whole_dict->str,&aprlen);
+ rv = apr_socket_send(aprsock, whole_dict->str, &aprlen);
/* This is copied from mod_cgi */
@@ -418,8 +420,8 @@
log_error("the Appserver provided an invalid response", r->server);
//return;
}
- sprintf(sbuf,"Status: %i",r->status);
- log_debug(sbuf,r);
+ sprintf(sbuf, "Status: %i", r->status);
+ log_debug(sbuf, r);
location = apr_table_get(r->headers_out, "Location");
if (location && location[0] == '/' && r->status == 200) {
@@ -464,11 +466,11 @@
{
long length;
wkcfg *cfg;
- WFILE* env_dict=NULL;
+ WFILE* env_dict = NULL;
int i;
char msgbuf[MAX_STRING_LEN];
int conn_attempt = 0;
- WFILE* whole_dict=NULL;
+ WFILE* whole_dict = NULL;
WFILE* int_dict = NULL;
const char *value;
const char *key;
@@ -478,7 +480,7 @@
if (strcmp(r->handler, "webkit-handler"))
return DECLINED;
- log_debug("In webkit_handler",r);
+ log_debug("In webkit_handler", r);
cfg = NULL;
cfg = ap_get_module_config(r->per_dir_config, &webkit_module);
@@ -504,7 +506,7 @@
//hdr_arr = ap_table_elts(r->subprocess_env);
array_header = (apr_array_header_t*)apr_table_elts(r->subprocess_env);
//elts = (table_entry *) hdr_arr->elts;
- tentry=(apr_table_entry_t*)array_header->elts;
+ tentry = (apr_table_entry_t*)array_header->elts;
/* start dictionary */
w_byte(TYPE_DICT, env_dict);
@@ -575,10 +577,10 @@
write_integer((int)length, int_dict);
- log_debug("dictionaries built",r);
+ log_debug("dictionaries built", r);
/* now we try to send it */
- for (conn_attempt = 1; conn_attempt<=cfg->retryattempts; conn_attempt++) {
+ for (conn_attempt = 1; conn_attempt <= cfg->retryattempts; conn_attempt++) {
int result = transact_with_app_server(r, cfg, whole_dict, int_dict, length);
if (result == 0) {
return OK;
@@ -603,7 +605,10 @@
if (strcmp(r->handler, "psp-handler"))
return DECLINED;
- r->handler=(char*)apr_pstrdup(r->pool, "webkit-handler");
+
+ log_debug("In psp_handler", r);
+
+ r->handler = (char*)apr_pstrdup(r->pool, "webkit-handler");
apr_table_add(r->subprocess_env, "WK_ABSOLUTE", "1");
return webkit_handler(r);
@@ -616,7 +621,7 @@
apr_pool_t *ptemp, server_rec *s)
{
/* Tell Apache we're here */
- ap_add_version_component(ptemp, "mod_webkit2/0.9.1");
+ ap_add_version_component(ptemp, VERSION_COMPONENT);
return OK;
}
@@ -708,7 +713,7 @@
static void webkit_register_hooks(apr_pool_t *p)
{
- ap_hook_post_config(webkit_post_config,NULL,NULL,APR_HOOK_MIDDLE);
+ ap_hook_post_config(webkit_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(webkit_handler, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(psp_handler, NULL, NULL, APR_HOOK_MIDDLE);
}
|