CVS update: php31/sapi
| From: | zeev | Date: | Fri, 21 Aug 1998 03:22:49 +0000 |
| Subject: | CVS update: php31/sapi | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-392@lists.php.net to get a copy of this message | ||
Date: Thursday August 20, 1998 @ 23:22
Author: zeev
Update of /repository/php31/sapi
In directory asf:/tmp/cvs-serv20231/sapi
Modified Files:
cgi_sapi.c
Log Message:
* Fix regex problems
* Nuke useless newlines, at least in CGI mode
all tests pass!
Index: php31/sapi/cgi_sapi.c
diff -c php31/sapi/cgi_sapi.c:2.10 php31/sapi/cgi_sapi.c:2.11
*** php31/sapi/cgi_sapi.c:2.10 Thu Aug 20 20:30:44 1998
--- php31/sapi/cgi_sapi.c Thu Aug 20 23:22:48 1998
***************
*** 52,59 ****
int sapi_insert_header(SAPI_GLOBAL_INCLUDE unsigned char *header)
{
! puts(header);
! if (puts("\015\012") < 0) {
sapi_info->abort = 1;
#if MSVC5
OutputDebugString("insert header failed\n");
--- 52,59 ----
int sapi_insert_header(SAPI_GLOBAL_INCLUDE unsigned char *header)
{
! fputs(header, stdout);
! if (fputs("\015\012", stdout) < 0) {
sapi_info->abort = 1;
#if MSVC5
OutputDebugString("insert header failed\n");
***************
*** 65,71 ****
int sapi_send_header(SAPI_GLOBAL_INCLUDE_V)
{
! if (puts("\015\012") < 0) {
sapi_info->abort = 1;
#if MSVC5
OutputDebugString("send header failed\n");
--- 65,71 ----
int sapi_send_header(SAPI_GLOBAL_INCLUDE_V)
{
! if (fputs("\015\012", stdout) < 0) {
sapi_info->abort = 1;
#if MSVC5
OutputDebugString("send header failed\n");
***************
*** 83,92 ****
int sapi_puts(SAPI_GLOBAL_INCLUDE unsigned char *string)
{
! if (puts(string) < 0) {
sapi_info->abort = 1;
#if MSVC5
! OutputDebugString("puts failed\n");
#endif
}
return SUCCESS;
--- 83,92 ----
int sapi_puts(SAPI_GLOBAL_INCLUDE unsigned char *string)
{
! if (fputs(string, stdout) < 0) {
sapi_info->abort = 1;
#if MSVC5
! OutputDebugString("fputs() failed\n");
#endif
}
return SUCCESS;
***************
*** 421,427 ****
#endif
if (!cgi) { /* never execute the arguments if you are a CGI */
sapi_info->argv0 = NULL;
! while ((c = getopt(argc, argv, "f:qvishpe?v")) != -1) {
switch (c) {
case 'f':
sapi_info->script_filename = strdup(optarg);
--- 421,427 ----
#endif
if (!cgi) { /* never execute the arguments if you are a CGI */
sapi_info->argv0 = NULL;
! while ((c = getopt(argc, argv, "fc:qvishpe?v")) != -1) {
switch (c) {
case 'f':
sapi_info->script_filename = strdup(optarg);
***************
*** 447,453 ****
sapi_info->display_source_mode = 1;
break;
case 'c':
! sapi_info->ini_path = strdup(optarg);
break;
case 'h':
case '?':
--- 447,453 ----
sapi_info->display_source_mode = 1;
break;
case 'c':
! /*sapi_info->ini_path = strdup(optarg);*/
break;
case 'h':
case '?':
--
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