CVS update: php31/main
| From: | shane | Date: | Fri, 21 Aug 1998 20:15:49 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-444@lists.php.net to get a copy of this message | ||
Date: Friday August 21, 1998 @ 16:15
Author: shane
Update of /repository/php31/main
In directory asf:/tmp/cvs-serv2745/main
Modified Files:
main.c php.h phpsapi_core.dsp
Log Message:
adding internal sapi_writeclient back into code. still need to work out
defines.
Index: php31/main/main.c
diff -c php31/main/main.c:2.18 php31/main/main.c:2.19
*** php31/main/main.c:2.18 Fri Aug 21 15:17:36 1998
--- php31/main/main.c Fri Aug 21 16:15:48 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.18 1998/08/21 19:17:36 zeev Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.19 1998/08/21 20:15:48 shane Exp $ */
/* #define CRASH_DETECTION */
***************
*** 74,79 ****
--- 74,80 ----
#include "php3_list.h"
#include "snprintf.h"
#include "ext/standard/dl.h"
+ #include "string_buffer.h"
#if WIN32|WINNT
#include <io.h>
#include <fcntl.h>
***************
*** 82,90 ****
#include <syslog.h>
#endif
! #if USE_SAPI
! # include "sapi/sapi.h"
! #endif
#ifdef THREAD_SAFE
/*This is indeed a global!*/
--- 83,89 ----
#include <syslog.h>
#endif
! #include "sapi/sapi.h"
#ifdef THREAD_SAFE
/*This is indeed a global!*/
***************
*** 242,247 ****
--- 241,257 ----
}
+ PHPAPI int php3_sapi_writeclient(void *buf, int size INLINE_TLS)
+ {
+
+ if (GLOBAL(sapi_rqst)->buffered_output) {
+ string_buffer_concat(&GLOBAL(sapi_rqst)->output_buffer, buf, size);
+ return size;
+ } else {
+ return GLOBAL(sapi_rqst)->writeclient(SAPI_GLOBAL_PASS buf,size);
+ }
+
+ }
PHPAPI int php3_printf(const char *format,...)
{
va_list args;
***************
*** 871,879 ****
}
if (cfg_get_string("sendmail_from", &php3_ini_master.sendmail_from) == FAILURE) {
php3_ini_master.sendmail_from = NULL;
- }
- if (cfg_get_long("error_reporting", &php3_ini_master.error_reporting) == FAILURE)
{
- php3_ini_master.error_reporting = E_ALL & ~E_NOTICE;
}
if (cfg_get_string("error_log", &php3_ini_master.error_log) == FAILURE) {
php3_ini_master.error_log = NULL;
--- 881,886 ----
Index: php31/main/php.h
diff -c php31/main/php.h:2.7 php31/main/php.h:2.8
*** php31/main/php.h:2.7 Fri Aug 21 12:41:06 1998
--- php31/main/php.h Fri Aug 21 16:15:49 1998
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: php.h,v 2.7 1998/08/21 16:41:06 shane Exp $ */
#ifndef _PHP_H
#define _PHP_H
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: php.h,v 2.8 1998/08/21 20:15:49 shane Exp $ */
#ifndef _PHP_H
#define _PHP_H
***************
*** 382,388 ****
extern void html_putc(char c);
extern int end_current_file_execution(INLINE_TLS_VOID);
! extern PHPAPI int php3_sapi_writeclient(void *buf, int size);
extern PHPAPI int php3_putc(char c);
extern PHPAPI int php3_puts(char *buf);
extern PHPAPI int php3_write(void *buf, int size);
--- 382,388 ----
extern void html_putc(char c);
extern int end_current_file_execution(INLINE_TLS_VOID);
! extern PHPAPI int php3_sapi_writeclient(void *buf, int size INLINE_TLS);
extern PHPAPI int php3_putc(char c);
extern PHPAPI int php3_puts(char *buf);
extern PHPAPI int php3_write(void *buf, int size);
Index: php31/main/phpsapi_core.dsp
diff -c php31/main/phpsapi_core.dsp:2.4 php31/main/phpsapi_core.dsp:2.5
*** php31/main/phpsapi_core.dsp:2.4 Fri Aug 14 12:34:26 1998
--- php31/main/phpsapi_core.dsp Fri Aug 21 16:15:49 1998
***************
*** 277,282 ****
--- 277,290 ----
# End Source File
# Begin Source File
+ SOURCE=.\string_buffer.c
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\string_buffer.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\tls.h
# End Source File
# Begin Source File
--
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