CVS update: php31/sapi

Date: Friday August 21, 1998 @ 12:41 Author: shane Update of /repository/php31/sapi In directory asf:/tmp/cvs-serv28030/sapi Modified Files: apache_sapi.c isapi_sapi.c sapi.h Log Message: Get everything fixed for windows, cgi working again, now will backtrack to get interactive mode working. Index: php31/sapi/apache_sapi.c diff -c php31/sapi/apache_sapi.c:2.5 php31/sapi/apache_sapi.c:2.6 *** php31/sapi/apache_sapi.c:2.5 Fri Aug 21 09:48:43 1998 --- php31/sapi/apache_sapi.c Fri Aug 21 12:41:06 1998 *************** *** 576,581 **** --- 576,582 ---- /*these are used in cgi, what do we do with them now */ sapi_info->cgi = 0; + sapi_info->interactive = 0; sapi_info->display_source_mode = 0; sapi_info->preprocess = 0; sapi_info->info_only = 0; Index: php31/sapi/isapi_sapi.c diff -c php31/sapi/isapi_sapi.c:2.10 php31/sapi/isapi_sapi.c:2.11 *** php31/sapi/isapi_sapi.c:2.10 Fri Aug 21 09:48:44 1998 --- php31/sapi/isapi_sapi.c Fri Aug 21 12:41:07 1998 *************** *** 440,445 **** --- 440,446 ---- sapi_info->info = sapi_print_info; sapi_info->aborted = sapi_aborted; sapi_info->abort = 0; + sapi_info->interactive = 0; sapi_info->insert_header = sapi_insert_header; sapi_info->treat_headers = sapi_treat_headers; Index: php31/sapi/sapi.h diff -c php31/sapi/sapi.h:2.8 php31/sapi/sapi.h:2.9 *** php31/sapi/sapi.h:2.8 Fri Aug 21 09:48:44 1998 --- php31/sapi/sapi.h Fri Aug 21 12:41:07 1998 *************** *** 51,57 **** unsigned int content_length; char *content_type; unsigned char *cookies; ! int cgi, display_source_mode, preprocess, info_only, quiet_mode; char *argv0, *ini_path, *script_filename; /* page stat vars */ long page_uid; --- 51,57 ---- unsigned int content_length; char *content_type; unsigned char *cookies; ! int cgi, display_source_mode, preprocess, info_only, quiet_mode, interactive; char *argv0, *ini_path, *script_filename; /* page stat vars */ long page_uid; *************** *** 117,125 **** #define PUTC(c) php3_puts(c); #define PHPWRITE(a,n) php3_write((a),(n)) #else #define PUTS(s) { char *str=(s); PHPWRITE(s,strlen(s)); } #define PUTC(c) { char ch=(c); PHPWRITE(&ch, 1); } - #define PHPWRITE(a,n) php3_sapi_writeclient(SAPI_GLOBAL_PASS (a),(n)) #define BLOCK_INTERRUPTIONS if(GLOBAL(sapi_rqst))GLOBAL(sapi_rqst)->blockalarms(SAPI_GLOBAL_PASS_V) #define UNBLOCK_INTERRUPTIONS if(GLOBAL(sapi_rqst))GLOBAL(sapi_rqst)->unblockalarms(SAPI_GLOBAL_PASS_V) #endif --- 117,125 ---- #define PUTC(c) php3_puts(c); #define PHPWRITE(a,n) php3_write((a),(n)) #else + #define PHPWRITE(a,n) php3_sapi_writeclient((a),(n)) #define PUTS(s) { char *str=(s); PHPWRITE(s,strlen(s)); } #define PUTC(c) { char ch=(c); PHPWRITE(&ch, 1); } #define BLOCK_INTERRUPTIONS if(GLOBAL(sapi_rqst))GLOBAL(sapi_rqst)->blockalarms(SAPI_GLOBAL_PASS_V) #define UNBLOCK_INTERRUPTIONS if(GLOBAL(sapi_rqst))GLOBAL(sapi_rqst)->unblockalarms(SAPI_GLOBAL_PASS_V) #endif -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net