[PHP-DEV] CVS update: php31/sapi From: shane (php-dev <email protected>)
Date: 08/25/98

Date: Tuesday August 25, 1998 @ 20:00
Author: shane

Update of /repository/php31/sapi
In directory asf:/u2/tmp/cvs-serv27900/sapi

Modified Files:
        wsapi.dsp wsapi_sapi.c
Log Message:
wsapi is now working completely (well, almost, mysql crashes wsapi but not
nsapi or isapi)

Index: php31/sapi/wsapi.dsp
diff -c php31/sapi/wsapi.dsp:2.1 php31/sapi/wsapi.dsp:2.2
*** php31/sapi/wsapi.dsp:2.1 Tue Aug 25 17:22:54 1998
--- php31/sapi/wsapi.dsp Tue Aug 25 20:00:40 1998
***************
*** 88,93 ****
--- 88,97 ----
  # Name "wsapi - Win32 Debug"
  # Begin Source File
  
+ SOURCE=.\wsapi.def
+ # End Source File
+ # Begin Source File
+
  SOURCE=.\wsapi_sapi.c
  # End Source File
  # End Target
Index: php31/sapi/wsapi_sapi.c
diff -c php31/sapi/wsapi_sapi.c:2.2 php31/sapi/wsapi_sapi.c:2.3
*** php31/sapi/wsapi_sapi.c:2.2 Tue Aug 25 18:52:26 1998
--- php31/sapi/wsapi_sapi.c Tue Aug 25 20:00:40 1998
***************
*** 134,140 ****
                          *r = '\0';
                          if (!strcasecmp(header, "HTTP")) {
                                  *r = '/';
! strcpy(tp->rsp_status,header);
                                  return SUCCESS;
                          }
                          *r = '/';
--- 134,141 ----
                          *r = '\0';
                          if (!strcasecmp(header, "HTTP")) {
                                  *r = '/';
! r = strchr(header, ' ');
! strcpy(tp->rsp_status,r+1);
                                  return SUCCESS;
                          }
                          *r = '/';
***************
*** 181,187 ****
                  /* We don't know content-length!!*/
                  tp->keep_alive = FALSE;
                  tp->content_length = -1;
! send_http_header(tp, FALSE);
          }
          return SUCCESS;
  }
--- 182,188 ----
                  /* We don't know content-length!!*/
                  tp->keep_alive = FALSE;
                  tp->content_length = -1;
! send_http_header(tp, TRUE);
          }
          return SUCCESS;
  }
***************
*** 312,334 ****
          PUTS("</table>\n");
  }
  
- char *_wsapi_build_cookies(TCTX *tp)
- {
- int i,p=0;
- char *cookies=NULL;
- char buf[MAX_BUFF_SIZE];
-
- for(i = 0; i < tp->num_req_xhdr; i++) // Search for cookie
- if(lstrcmpi("Cookie", tp->req_xhdr[i].key) == 0 && p<MAX_BUFF_SIZE){
- strncpy(buf+p,tp->req_xhdr[i].key,MAX_BUFF_SIZE-p);
- p=strlen(buf);
- buf[p]='=';
- p++;
- buf[p]='\0';
- p++;
- }
- return strdup(buf);
- }
  
  struct sapi_request_info *sapi_init(TCTX *tp)
  {
--- 313,318 ----
***************
*** 352,358 ****
          sapi_info->script_name = _sapi_getenv(tp, "SCRIPT_NAME");
          sapi_info->content_length = tp->content_length;
          sapi_info->content_type = tp->content_type;
! sapi_info->cookies = _wsapi_build_cookies(tp);
          sapi_info->authorization = tp->auth_line;
  
          sapi_info->getenv = sapi_getenv;
--- 336,342 ----
          sapi_info->script_name = _sapi_getenv(tp, "SCRIPT_NAME");
          sapi_info->content_length = tp->content_length;
          sapi_info->content_type = tp->content_type;
! sapi_info->cookies = _sapi_getenv(tp, "HTTP_COOKIE");
          sapi_info->authorization = tp->auth_line;
  
          sapi_info->getenv = sapi_getenv; 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>