 |
 |
 |
 |
|
|
Date: 06/13/99
- Next message: Paul Andersen: "[PHP-DEV] compile prob with functions/posix.c"
- Previous message: adam <email protected>: "[PHP-DEV] Bug #1534: metaphone as an alternative to soundex"
- Next in thread: jim: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Sunday June 13, 1999 @ 10:23
Author: abelits
Update of /repository/php3
In directory php:/tmp/cvs-serv8129/php3
Modified Files:
main.c
Log Message:
fhttpd output functions used for php3_write(), php3_puts() and php3_putc()
if compiled as fhttpd module
Index: php3/main.c
diff -u php3/main.c:1.498 php3/main.c:1.499
--- php3/main.c:1.498 Fri May 21 15:32:06 1999
+++ php3/main.c Sun Jun 13 10:23:13 1999
@@ -29,7 +29,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.498 1999/05/21 19:32:06 sas Exp $ */
+/* $Id: main.c,v 1.499 1999/06/13 14:23:13 abelits Exp $ */
/* #define CRASH_DETECTION */
@@ -178,10 +178,14 @@
TLS_VARS;
#if APACHE
- ret = rwrite(a,n,GLOBAL(php3_rqst));
+ ret = rwrite(a,n,GLOBAL(php3_rqst));
+#else
+#if FHTTPD
+ ret = php3_fhttpd_write((void*)a,n);
#else /* CGI */
ret = fwrite(a,1,n,stdout);
#endif
+#endif
if (ret != n) {
GLOBAL(php_connection_status) |= PHP_CONNECTION_ABORTED;
@@ -202,11 +206,15 @@
} else {
fputs(s, stdout);
}
+#else
+#if FHTTPD
+ php3_fhttpd_puts((char*)s);
#else /* CGI */
if (fputs(s, stdout) < 0) {
GLOBAL(php_connection_status) |= PHP_CONNECTION_ABORTED;
}
#endif
+#endif
}
PHPAPI void php3_putc(char c)
@@ -222,10 +230,14 @@
fputc(c, stdout);
}
#else
+#if FHTTPD
+ php3_fhttpd_putc(c);
+#else /* CGI */
if (fputc(c, stdout) != c) {
GLOBAL(php_connection_status) |= PHP_CONNECTION_ABORTED;
}
#endif
+#endif
}
void php3_log_err(char *log_message)
@@ -312,7 +324,7 @@
#if FHTTPD
size = vsnprintf(buffer, PRINTF_BUFFER_SIZE, format, args);
- ret = PHPWRITE(buffer, size);
+ ret = php3_fhttpd_write(buffer, size);
#endif
#if USE_SAPI
-- PHP Development Mailing List (http://www.php.net/) To unsubscribe, e-mail: php-dev-unsubscribe <email protected> For additional commands, e-mail: php-dev-help <email protected> To contact the list administrators, e-mail: php-list-admin <email protected>
- Next message: Paul Andersen: "[PHP-DEV] compile prob with functions/posix.c"
- Previous message: adam <email protected>: "[PHP-DEV] Bug #1534: metaphone as an alternative to soundex"
- Next in thread: jim: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]