 |
 |
 |
 |
|
|
Date: 06/26/98
- Next message: rasmus: "[PHP-DEV] CVS update: php31/ext/standard"
- Previous message: shane: "[PHP-DEV] CVS update: php31/main"
- Next in thread: shane: "[PHP-DEV] CVS update: php31/sapi"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Friday June 26, 1998 @ 16:27
Author: shane
Update of /repository/php31/sapi
In directory asf:/tmp/cvs-serv10347/sapi
Modified Files:
apache_sapi.c cgi_sapi.c isapi_sapi.c mod_php3.c sapi.h
Log Message:
ApacheNT module now parses as well as isapi!
Index: php31/sapi/apache_sapi.c
diff -c php31/sapi/apache_sapi.c:1.9 php31/sapi/apache_sapi.c:1.10
*** php31/sapi/apache_sapi.c:1.9 Fri Jun 26 15:11:08 1998
--- php31/sapi/apache_sapi.c Fri Jun 26 16:27:33 1998
***************
*** 284,290 ****
/* this was php3_apache_putc */
int sapi_putc(SAPI_GLOBAL_INCLUDE char c){
SAPI_FUNC_VARS;
!
if (php3_rqst) {
return rputc(c, php3_rqst);
} else {
--- 284,290 ----
/* this was php3_apache_putc */
int sapi_putc(SAPI_GLOBAL_INCLUDE char c){
SAPI_FUNC_VARS;
!
if (php3_rqst) {
return rputc(c, php3_rqst);
} else {
***************
*** 296,301 ****
--- 296,302 ----
int sapi_writeclient(SAPI_GLOBAL_INCLUDE char *string, int len){
SAPI_FUNC_VARS;
+
if (php3_rqst) {
return rputs(string, php3_rqst);
} else {
***************
*** 340,345 ****
--- 341,351 ----
register_cleanup(php3_rqst->pool, arg1, arg2, arg3);
}
+ int sapi_aborted(SAPI_GLOBAL_INCLUDE_V){
+ SAPI_FUNC_VARS;
+ return php3_rqst->connection->aborted;
+ }
+
#if defined(CRASH_DETECTION)
/******************************************************************************
/* apache crash detection
***************
*** 582,588 ****
sapi_info->page_uid = php3_rqst->finfo.st_uid;
sapi_info->page_inode = php3_rqst->finfo.st_ino;
sapi_info->page_mtime = php3_rqst->finfo.st_mtime;
!
return sapi_info;
}
--- 588,594 ----
sapi_info->page_uid = php3_rqst->finfo.st_uid;
sapi_info->page_inode = php3_rqst->finfo.st_ino;
sapi_info->page_mtime = php3_rqst->finfo.st_mtime;
! sapi_info->aborted = sapi_aborted;
return sapi_info;
}
Index: php31/sapi/cgi_sapi.c
diff -c php31/sapi/cgi_sapi.c:1.17 php31/sapi/cgi_sapi.c:1.18
*** php31/sapi/cgi_sapi.c:1.17 Fri Jun 26 12:53:42 1998
--- php31/sapi/cgi_sapi.c Fri Jun 26 16:27:34 1998
***************
*** 85,90 ****
--- 85,93 ----
}
void sapi_treat_headers(SAPI_GLOBAL_INCLUDE_V){
}
+ int sapi_aborted(SAPI_GLOBAL_INCLUDE_V){
+ return 0;
+ }
#if defined(CRASH_DETECTION)
/******************************************************************************
***************
*** 174,179 ****
--- 177,183 ----
sapi_info->unblockalarms=sapi_unblock;
sapi_info->log=sapi_log;
sapi_info->info=sapi_print_info;
+ sapi_info->aborted = sapi_aborted;
/*page stat info*/
sapi_info->page_uid=0;
Index: php31/sapi/isapi_sapi.c
diff -c php31/sapi/isapi_sapi.c:1.18 php31/sapi/isapi_sapi.c:1.19
*** php31/sapi/isapi_sapi.c:1.18 Fri Jun 26 13:33:27 1998
--- php31/sapi/isapi_sapi.c Fri Jun 26 16:27:34 1998
***************
*** 181,186 ****
--- 181,191 ----
SAPI_FUNC_VARS;
}
+ int sapi_aborted(SAPI_GLOBAL_INCLUDE_V){
+ SAPI_FUNC_VARS;
+ return 0;
+ }
+
#if defined(CRASH_DETECTION)
/******************************************************************************
/* crash detection logging
***************
*** 308,313 ****
--- 313,319 ----
sapi_info->unblockalarms=sapi_unblock;
sapi_info->log=sapi_log;
sapi_info->info=sapi_print_info;
+ sapi_info->aborted = sapi_aborted;
sapi_info->insert_header=sapi_insert_header;
sapi_info->treat_headers=sapi_treat_headers;
Index: php31/sapi/mod_php3.c
diff -c php31/sapi/mod_php3.c:1.4 php31/sapi/mod_php3.c:1.5
*** php31/sapi/mod_php3.c:1.4 Fri Jun 26 15:11:09 1998
--- php31/sapi/mod_php3.c Fri Jun 26 16:27:35 1998
***************
*** 27,33 ****
| (with helpful hints from Dean Gaudet <dgaudet <email protected>> |
+----------------------------------------------------------------------+
*/
! /* $Id: mod_php3.c,v 1.4 1998/06/26 19:11:09 shane Exp $ */
#include "php3_apache.h"
--- 27,33 ----
| (with helpful hints from Dean Gaudet <dgaudet <email protected>> |
+----------------------------------------------------------------------+
*/
! /* $Id: mod_php3.c,v 1.5 1998/06/26 20:27:35 shane Exp $ */
#include "php3_apache.h"
***************
*** 104,109 ****
--- 104,110 ----
}
/* Open the file */
/* popenf isnt working on windows, so lets just open it*/
+ #if 0
#if WIN32|WINNT
fd = open(r->filename, O_RDONLY,0);
#else
***************
*** 112,117 ****
--- 113,119 ----
return FORBIDDEN;
}
#endif
+ #endif
/* Apache 1.2 has a more complex mechanism for reading POST data */
#if MODULE_MAGIC_NUMBER > 19961007
if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR)))
***************
*** 145,154 ****
--- 147,158 ----
/* Done, restore umask, turn off timeout, close file and return */
php3_restore_umask();
kill_timeout(r);
+ #if 0
#if WIN32|WINNT
close(fd);
#else
pclosef(r->pool, fd);
+ #endif
#endif
return OK;
}
Index: php31/sapi/sapi.h
diff -c php31/sapi/sapi.h:1.16 php31/sapi/sapi.h:1.17
*** php31/sapi/sapi.h:1.16 Fri Jun 26 12:53:42 1998
--- php31/sapi/sapi.h Fri Jun 26 16:27:35 1998
***************
*** 52,58 ****
char *cookies;
int cgi, display_source_mode,preprocess,info_only,quiet_mode;
char *argv0,*ini_path,*script_filename;
- int *aborted; /* same as apaches php3_rqst->connection->aborted*/
/* page stat vars */
long page_uid;
long page_inode;
--- 52,57 ----
***************
*** 64,69 ****
--- 63,69 ----
int (*insert_header)(SAPI_GLOBAL_INCLUDE char *); /*insert header into a list*/
int (*send_header)(SAPI_GLOBAL_INCLUDE_V); /*write headers to client*/
void (*treat_headers)(SAPI_GLOBAL_INCLUDE_V);
+ int (*aborted)(SAPI_GLOBAL_INCLUDE_V); /* returns: same as apaches php3_rqst->connection->aborted*/
/* io functions */
int (*readclient)(SAPI_GLOBAL_INCLUDE char *, int );
- Next message: rasmus: "[PHP-DEV] CVS update: php31/ext/standard"
- Previous message: shane: "[PHP-DEV] CVS update: php31/main"
- Next in thread: shane: "[PHP-DEV] CVS update: php31/sapi"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]