[BACK]Return to phttpd.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / sapi / phttpd

Diff for /embedaddon/php/sapi/phttpd/phttpd.c between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 23:48:06 version 1.1.1.4, 2014/06/15 20:04:02
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 71  php_phttpd_sapi_header_handler(sapi_header_struct *sap Line 71  php_phttpd_sapi_header_handler(sapi_header_struct *sap
 {  {
     char *header_name, *header_content;      char *header_name, *header_content;
     char *p;      char *p;
     TSRMLS_FETCH();  
     
         http_sendheaders(PHG(cip)->fd, PHG(cip), SG(sapi_headers).http_response_code, NULL);          http_sendheaders(PHG(cip)->fd, PHG(cip), SG(sapi_headers).http_response_code, NULL);
   
Line 97  php_phttpd_sapi_header_handler(sapi_header_struct *sap Line 96  php_phttpd_sapi_header_handler(sapi_header_struct *sap
 static int  static int
 php_phttpd_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)  php_phttpd_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
 {  {
     TSRMLS_FETCH();  
    
     if (SG(sapi_headers).send_default_content_type) {      if (SG(sapi_headers).send_default_content_type) {
                 fd_printf(PHG(cip)->fd,"Content-Type: text/html\n");                  fd_printf(PHG(cip)->fd,"Content-Type: text/html\n");
     }      }
Line 115  php_phttpd_sapi_read_cookies(TSRMLS_D) Line 112  php_phttpd_sapi_read_cookies(TSRMLS_D)
 /*  /*
     int i;      int i;
     char *http_cookie = NULL;      char *http_cookie = NULL;
     NTSRMLS_FETCH();  
     
     i = Ns_SetIFind(NSG(conn->headers), "cookie");      i = Ns_SetIFind(NSG(conn->headers), "cookie");
     if(i != -1) {      if(i != -1) {
Line 135  php_phttpd_sapi_read_post(char *buf, uint count_bytes  Line 131  php_phttpd_sapi_read_post(char *buf, uint count_bytes 
 /*  /*
     uint max_read;      uint max_read;
     uint total_read = 0;      uint total_read = 0;
     NTSRMLS_FETCH();  
     
     max_read = MIN(NSG(data_avail), count_bytes);      max_read = MIN(NSG(data_avail), count_bytes);
     
Line 243  php_phttpd_request_dtor(TSRMLS_D TSRMLS_DC) Line 238  php_phttpd_request_dtor(TSRMLS_D TSRMLS_DC)
 }  }
   
   
int php_doit(TSRMLS_D TSRMLS_DC)int php_doit(TSRMLS_D)
 {  {
         struct stat sb;          struct stat sb;
         zend_file_handle file_handle;          zend_file_handle file_handle;
         struct httpinfo *hip = PHG(cip)->hip;          struct httpinfo *hip = PHG(cip)->hip;
         TSRMLS_FETCH();  
   
         if (php_request_startup(TSRMLS_C) == FAILURE) {          if (php_request_startup(TSRMLS_C) == FAILURE) {
         return -1;          return -1;
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>