sniper Sun Feb 9 18:48:59 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/nsapi nsapi.c
Log:
MFH (ws fixes, but merged to ease any fix patch merging)
Index: php4/sapi/nsapi/nsapi.c
diff -u php4/sapi/nsapi/nsapi.c:1.28.2.3 php4/sapi/nsapi/nsapi.c:1.28.2.4
--- php4/sapi/nsapi/nsapi.c:1.28.2.3 Sun Feb 9 18:30:08 2003
+++ php4/sapi/nsapi/nsapi.c Sun Feb 9 18:48:59 2003
@@ -17,6 +17,8 @@
+----------------------------------------------------------------------+
*/
+/* $Id: nsapi.c,v 1.28.2.4 2003/02/09 23:48:59 sniper Exp $ */
+
/*
* PHP includes
*/
@@ -128,36 +130,35 @@
};
static size_t nsapi_client_size = sizeof(nsapi_client)/sizeof(nsapi_client[0]);
-static char *
-nsapi_strdup(char *str)
+static char *nsapi_strdup(char *str)
{
- if (str != NULL)
+ if (str != NULL) {
return STRDUP(str);
+ }
return NULL;
}
-static void
-nsapi_free(void *addr)
+static void nsapi_free(void *addr)
{
- if (addr != NULL)
+ if (addr != NULL) {
FREE(addr);
+ }
}
-static int
-sapi_nsapi_ub_write(const char *str, unsigned int str_length TSRMLS_DC)
+static int sapi_nsapi_ub_write(const char *str, unsigned int str_length TSRMLS_DC)
{
int retval;
nsapi_request_context *rc;
rc = (nsapi_request_context *)SG(server_context);
retval = net_write(rc->sn->csd, (char *)str, str_length);
- if (retval == IO_ERROR /*-1*/ || retval == IO_EOF /*0*/)
+ if (retval == IO_ERROR /* -1 */ || retval == IO_EOF /* 0 */) {
php_handle_aborted_connection();
+ }
return retval;
}
-static int
-sapi_nsapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct
*sapi_headers TSRMLS_DC)
+static int sapi_nsapi_header_handler(sapi_header_struct *sapi_header,
+sapi_headers_struct *sapi_headers TSRMLS_DC)
{
char *header_name, *header_content, *p;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
@@ -172,7 +173,7 @@
*p = 0;
do {
header_content++;
- } while (*header_content==' ');
+ } while (*header_content == ' ');
if (!strcasecmp(header_name, "Content-Type")) {
param_free(pblock_remove("content-type", rc->rq->srvhdrs));
@@ -190,8 +191,7 @@
return 0; /* don't use the default SAPI mechanism, NSAPI duplicates this
functionality */
}
-static int
-sapi_nsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
+static int sapi_nsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
int retval;
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
@@ -207,14 +207,15 @@
protocol_status(rc->sn, rc->rq, SG(sapi_headers).http_response_code, NULL);
retval = protocol_start_response(rc->sn, rc->rq);
- if (retval == REQ_PROCEED || retval == REQ_NOACTION)
+
+ if (retval == REQ_PROCEED || retval == REQ_NOACTION) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
- else
+ } else {
return SAPI_HEADER_SEND_FAILED;
+ }
}
-static int
-sapi_nsapi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
+static int sapi_nsapi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
char *read_ptr = buffer, *content_length_str = NULL;
@@ -238,8 +239,9 @@
}
#endif
- if (content_length <= 0)
+ if (content_length <= 0) {
return 0;
+ }
/*
* Gobble any pending data in the netbuf.
@@ -259,20 +261,25 @@
*/
while (content_length > 0 && bytes_read < count_bytes) {
int bytes_to_read = count_bytes - bytes_read;
- if (content_length < bytes_to_read)
+
+ if (content_length < bytes_to_read) {
bytes_to_read = content_length;
+ }
length = net_read(rc->sn->csd, read_ptr, bytes_to_read,
NSAPI_READ_TIMEOUT);
- if (length == IO_ERROR || length == IO_EOF)
+
+ if (length == IO_ERROR || length == IO_EOF) {
break;
+ }
bytes_read += length;
read_ptr += length;
content_length -= length;
}
- if ( bytes_read > 0 )
+ if ( bytes_read > 0 ) {
rc->read_post_bytes += bytes_read;
+ }
return bytes_read;
}
@@ -285,8 +292,7 @@
return cookie_string;
}
-static void
-sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC)
+static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC)
{
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
register size_t i;
@@ -297,28 +303,28 @@
for (i = 0; i < nsapi_reqpb_size; i++) {
value = pblock_findval(nsapi_reqpb[i].nsapi_eq, rc->rq->reqpb);
if (value) {
- php_register_variable( (char *)nsapi_reqpb[i].env_var, value,
track_vars_array TSRMLS_CC );
+ php_register_variable((char *)nsapi_reqpb[i].env_var, value,
+track_vars_array TSRMLS_CC);
}
}
for (i = 0; i < nsapi_headers_size; i++) {
value = pblock_findval(nsapi_headers[i].nsapi_eq, rc->rq->headers);
if (value) {
- php_register_variable( (char *)nsapi_headers[i].env_var,
value, track_vars_array TSRMLS_CC );
+ php_register_variable((char *)nsapi_headers[i].env_var, value,
+track_vars_array TSRMLS_CC);
}
}
for (i=0; i < rc->rq->headers->hsize; i++) {
entry=rc->rq->headers->ht[i];
while (entry) {
- snprintf(buf,NS_BUF_SIZE,"HTTP_%s",entry->param->name);
+ snprintf(buf, NS_BUF_SIZE, "HTTP_%s", entry->param->name);
for(p = buf + 5; *p; p++) {
*p = toupper(*p);
- if(*p < 'A' || *p > 'Z') {
+ if (*p < 'A' || *p > 'Z') {
*p = '_';
}
}
- php_register_variable( buf, entry->param->value,
track_vars_array TSRMLS_CC );
+ php_register_variable(buf, entry->param->value,
+track_vars_array TSRMLS_CC);
entry=entry->next;
}
}
@@ -326,49 +332,45 @@
for (i = 0; i < nsapi_vars_size; i++) {
value = pblock_findval(nsapi_vars[i].nsapi_eq, rc->rq->vars);
if (value) {
- php_register_variable( (char *)nsapi_vars[i].env_var, value,
track_vars_array TSRMLS_CC );
+ php_register_variable((char *)nsapi_vars[i].env_var, value,
+track_vars_array TSRMLS_CC);
}
}
for (i = 0; i < nsapi_client_size; i++) {
value = pblock_findval(nsapi_client[i].nsapi_eq, rc->sn->client);
if (value) {
- php_register_variable( (char *)nsapi_client[i].env_var, value,
track_vars_array TSRMLS_CC );
+ php_register_variable((char *)nsapi_client[i].env_var, value,
+track_vars_array TSRMLS_CC);
}
}
if (value = session_dns(rc->sn)) {
- php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC
);
+ php_register_variable("REMOTE_HOST", value, track_vars_array
+TSRMLS_CC);
nsapi_free(value);
}
sprintf(buf, "%d", conf_getglobals()->Vport);
- php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC );
-
- php_register_variable("SERVER_NAME", conf_getglobals()->Vserver_hostname,
track_vars_array TSRMLS_CC );
+ php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC);
+ php_register_variable("SERVER_NAME", conf_getglobals()->Vserver_hostname,
+track_vars_array TSRMLS_CC);
value = http_uri2url_dynamic("", "", rc->sn, rc->rq);
- php_register_variable("SERVER_URL", value, track_vars_array TSRMLS_CC );
+ php_register_variable("SERVER_URL", value, track_vars_array TSRMLS_CC);
nsapi_free(value);
- php_register_variable("SERVER_SOFTWARE", system_version(), track_vars_array
TSRMLS_CC );
-
- php_register_variable("HTTPS", (security_active ? "ON" : "OFF"),
track_vars_array TSRMLS_CC );
-
- php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array
TSRMLS_CC );
-
+ php_register_variable("SERVER_SOFTWARE", system_version(), track_vars_array
+TSRMLS_CC);
+ php_register_variable("HTTPS", (security_active ? "ON" : "OFF"),
+track_vars_array TSRMLS_CC);
+ php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array
+TSRMLS_CC);
/* DOCUMENT_ROOT */
if (value = request_translate_uri("/", rc->sn)) {
- value[strlen(value)-1]=0;
- php_register_variable("DOCUMENT_ROOT", value, track_vars_array
TSRMLS_CC );
+ value[strlen(value) - 1] = 0;
+ php_register_variable("DOCUMENT_ROOT", value, track_vars_array
+TSRMLS_CC);
nsapi_free(value);
}
/* PATH_TRANSLATED */
if (value = pblock_findval("path-info", rc->rq->vars)) {
if (value = request_translate_uri(value, rc->sn)) {
- php_register_variable("PATH_TRANSLATED", value,
track_vars_array TSRMLS_CC );
+ php_register_variable("PATH_TRANSLATED", value,
+track_vars_array TSRMLS_CC);
nsapi_free(value);
}
}
@@ -377,31 +379,29 @@
if (value = pblock_findval("uri", rc->rq->reqpb)) {
snprintf(buf,NS_BUF_SIZE, "%s", value);
if (value = pblock_findval("query", rc->rq->reqpb)) {
- p=strchr(buf,0);
+ p = strchr(buf, 0);
snprintf(p, NS_BUF_SIZE-(p-buf), "?%s", value);
}
- php_register_variable("REQUEST_URI", buf, track_vars_array TSRMLS_CC );
+ php_register_variable("REQUEST_URI", buf, track_vars_array TSRMLS_CC);
}
/* Create Script-Name */
if (value = pblock_findval("uri", rc->rq->reqpb)) {
snprintf(buf,NS_BUF_SIZE, "%s", value);
if (value = pblock_findval("path-info", rc->rq->vars)) {
- buf[strlen(buf) - strlen(value)]=0;
+ buf[strlen(buf) - strlen(value)] = 0;
}
- php_register_variable("SCRIPT_NAME", buf, track_vars_array TSRMLS_CC );
+ php_register_variable("SCRIPT_NAME", buf, track_vars_array TSRMLS_CC);
}
}
-static void
-nsapi_log_message(char *message)
+static void nsapi_log_message(char *message)
{
TSRMLS_FETCH();
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
- log_error(LOG_INFORM, "PHP module", rc->sn, rc->rq,
- "%s", message);
-}
+ log_error(LOG_INFORM, "PHP module", rc->sn, rc->rq, "%s", message);
+}
static int php_nsapi_startup(sapi_module_struct *sapi_module)
{
@@ -413,48 +413,48 @@
static sapi_module_struct nsapi_sapi_module = {
- "nsapi", /* name */
- "NSAPI", /* pretty name */
+ "nsapi", /* name */
+ "NSAPI", /* pretty name */
- php_nsapi_startup, /* startup */
- php_module_shutdown_wrapper, /* shutdown */
+ php_nsapi_startup, /* startup */
+ php_module_shutdown_wrapper, /* shutdown */
- NULL, /* activate */
- NULL, /* deactivate */
+ NULL, /* activate */
+ NULL, /* deactivate */
- sapi_nsapi_ub_write, /* unbuffered write */
- NULL, /* flush */
- NULL, /* get uid */
- NULL, /* getenv */
+ sapi_nsapi_ub_write, /* unbuffered write */
+ NULL, /* flush */
+ NULL, /* get uid */
+ NULL, /* getenv */
- php_error, /* error handler */
+ php_error, /* error handler */
- sapi_nsapi_header_handler, /* header handler */
- sapi_nsapi_send_headers, /* send headers handler */
- NULL, /* send header handler */
+ sapi_nsapi_header_handler, /* header handler */
+ sapi_nsapi_send_headers, /* send headers handler */
+ NULL, /* send header handler */
- sapi_nsapi_read_post, /* read POST data */
- sapi_nsapi_read_cookies, /* read Cookies */
+ sapi_nsapi_read_post, /* read POST data */
+ sapi_nsapi_read_cookies, /* read Cookies */
- sapi_nsapi_register_server_variables, /* register server variables */
- nsapi_log_message, /* Log message */
+ sapi_nsapi_register_server_variables, /* register server variables */
+ nsapi_log_message, /* Log message */
- NULL, /* Block interruptions */
- NULL, /* Unblock interruptions */
+ NULL, /* Block interruptions */
+ NULL, /* Unblock interruptions */
STANDARD_SAPI_MODULE_PROPERTIES
};
-static void
-nsapi_request_ctor(NSLS_D TSRMLS_DC)
+
+static void nsapi_request_ctor(NSLS_D TSRMLS_DC)
{
- char *query_string = pblock_findval("query", NSG(rq)->reqpb);
- char *uri = pblock_findval("uri", NSG(rq)->reqpb);
- char *path_info = pblock_findval("path-info", NSG(rq)->vars);
- char *request_method = pblock_findval("method", NSG(rq)->reqpb);
- char *content_type = pblock_findval("content-type", NSG(rq)->headers);
- char *content_length = pblock_findval("content-length", NSG(rq)->headers);
- char *path_translated=pblock_findval("path", NSG(rq)->vars);;
+ char *query_string = pblock_findval("query", NSG(rq)->reqpb);
+ char *uri = pblock_findval("uri", NSG(rq)->reqpb);
+ char *path_info = pblock_findval("path-info", NSG(rq)->vars);
+ char *request_method = pblock_findval("method", NSG(rq)->reqpb);
+ char *content_type = pblock_findval("content-type", NSG(rq)->headers);
+ char *content_length = pblock_findval("content-length", NSG(rq)->headers);
+ char *path_translated = pblock_findval("path", NSG(rq)->vars);;
#if defined(NSAPI_DEBUG)
log_error(LOG_INFORM, "nsapi_request_ctor", NSG(sn), NSG(rq),
@@ -483,8 +483,7 @@
SG(sapi_headers).http_response_code = 200;
}
-static void
-nsapi_request_dtor(NSLS_D TSRMLS_DC)
+static void nsapi_request_dtor(NSLS_D TSRMLS_DC)
{
nsapi_free(SG(request_info).query_string);
nsapi_free(SG(request_info).request_uri);
@@ -493,8 +492,7 @@
nsapi_free(SG(request_info).content_type);
}
-int
-nsapi_module_main(NSLS_D TSRMLS_DC)
+int nsapi_module_main(NSLS_D TSRMLS_DC)
{
zend_file_handle file_handle;
@@ -508,22 +506,20 @@
file_handle.opened_path = NULL;
#if defined(NSAPI_DEBUG)
- log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq),
- "Parsing [%s]", SG(request_info).path_translated);
+ log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq), "Parsing [%s]",
+SG(request_info).path_translated);
#endif
php_execute_script(&file_handle TSRMLS_CC);
php_request_shutdown(NULL);
#if defined(NSAPI_DEBUG)
- log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq),
- "PHP request finished Ok");
+ log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq), "PHP request
+finished Ok");
#endif
+
return SUCCESS;
}
-void NSAPI_PUBLIC
-php4_close(void *vparam)
+void NSAPI_PUBLIC php4_close(void *vparam)
{
if (nsapi_sapi_module.shutdown) {
nsapi_sapi_module.shutdown(&nsapi_sapi_module);
@@ -531,8 +527,7 @@
tsrm_shutdown();
}
-int NSAPI_PUBLIC
-php4_init(pblock *pb, Session *sn, Request *rq)
+int NSAPI_PUBLIC php4_init(pblock *pb, Session *sn, Request *rq)
{
php_core_globals *core_globals;
@@ -546,12 +541,10 @@
return REQ_PROCEED;
}
-int NSAPI_PUBLIC
-php4_execute(pblock *pb, Session *sn, Request *rq)
+int NSAPI_PUBLIC php4_execute(pblock *pb, Session *sn, Request *rq)
{
int retval;
nsapi_request_context *request_context;
-
TSRMLS_FETCH();
request_context = (nsapi_request_context
*)MALLOC(sizeof(nsapi_request_context));
@@ -586,10 +579,21 @@
/ <Object ppath="path/to/be/authenticated/by/php/*">
/ AuthTrans fn="php4_auth_trans"
/*********************************************************/
-int NSAPI_PUBLIC
-php4_auth_trans(pblock * pb, Session * sn, Request * rq)
+int NSAPI_PUBLIC php4_auth_trans(pblock * pb, Session * sn, Request * rq)
{
- /*This is a DO NOTHING function that allows authentication information
- to be passed through to PHP scripts.*/
+ /* This is a DO NOTHING function that allows authentication
+ * information
+ * to be passed through to PHP scripts.
+ */
return REQ_PROCEED;
}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
+
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
