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

Diff for /embedaddon/php/sapi/cli/php_cli_server.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/10/14 08:02:45 version 1.1.1.4, 2014/06/15 20:04:02
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2013 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 408  static void append_essential_headers(smart_str* buffer Line 408  static void append_essential_headers(smart_str* buffer
 {  {
         {          {
                 char **val;                  char **val;
                if (SUCCESS == zend_hash_find(&client->request.headers, "Host", sizeof("Host"), (void**)&val)) {                if (SUCCESS == zend_hash_find(&client->request.headers, "host", sizeof("host"), (void**)&val)) {
                         smart_str_appendl_ex(buffer, "Host", sizeof("Host") - 1, persistent);                          smart_str_appendl_ex(buffer, "Host", sizeof("Host") - 1, persistent);
                         smart_str_appendl_ex(buffer, ": ", sizeof(": ") - 1, persistent);                          smart_str_appendl_ex(buffer, ": ", sizeof(": ") - 1, persistent);
                         smart_str_appends_ex(buffer, *val, persistent);                          smart_str_appends_ex(buffer, *val, persistent);
Line 558  static char *sapi_cli_server_read_cookies(TSRMLS_D) /* Line 558  static char *sapi_cli_server_read_cookies(TSRMLS_D) /*
 {  {
         php_cli_server_client *client = SG(server_context);          php_cli_server_client *client = SG(server_context);
         char **val;          char **val;
        if (FAILURE == zend_hash_find(&client->request.headers, "Cookie", sizeof("Cookie"), (void**)&val)) {        if (FAILURE == zend_hash_find(&client->request.headers, "cookie", sizeof("cookie"), (void**)&val)) {
                 return NULL;                  return NULL;
         }          }
         return *val;          return *val;
Line 1556  static int php_cli_server_client_read_request_on_heade Line 1556  static int php_cli_server_client_read_request_on_heade
                 return 1;                  return 1;
         }          }
         {          {
                char *header_name = client->current_header_name;                char *header_name = zend_str_tolower_dup(client->current_header_name, client->current_header_name_len);
                size_t header_name_len = client->current_header_name_len;                zend_hash_add(&client->request.headers, header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL);
                char c = header_name[header_name_len];                efree(header_name);
                header_name[header_name_len] = '\0'; 
                zend_hash_add(&client->request.headers, header_name, header_name_len + 1, &value, sizeof(char *), NULL); 
                header_name[header_name_len] = c; 
         }          }
   
         if (client->current_header_name_allocated) {          if (client->current_header_name_allocated) {
Line 1592  static int php_cli_server_client_read_request_on_body( Line 1589  static int php_cli_server_client_read_request_on_body(
                 }                  }
                 client->request.content_len = 0;                  client->request.content_len = 0;
         }          }
           client->request.content = perealloc(client->request.content, client->request.content_len + length, 1);
         memmove(client->request.content + client->request.content_len, at, length);          memmove(client->request.content + client->request.content_len, at, length);
         client->request.content_len += length;          client->request.content_len += length;
         return 0;          return 0;
Line 1719  static void php_cli_server_client_populate_request_inf Line 1717  static void php_cli_server_client_populate_request_inf
         request_info->post_data = client->request.content;          request_info->post_data = client->request.content;
         request_info->content_length = request_info->post_data_length = client->request.content_len;          request_info->content_length = request_info->post_data_length = client->request.content_len;
         request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;          request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
        if (SUCCESS == zend_hash_find(&client->request.headers, "Content-Type", sizeof("Content-Type"), (void**)&val)) {        if (SUCCESS == zend_hash_find(&client->request.headers, "content-type", sizeof("content-type"), (void**)&val)) {
                 request_info->content_type = *val;                  request_info->content_type = *val;
         }          }
 } /* }}} */  } /* }}} */
Line 1957  static int php_cli_server_begin_send_static(php_cli_se Line 1955  static int php_cli_server_begin_send_static(php_cli_se
 static int php_cli_server_request_startup(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) { /* {{{ */  static int php_cli_server_request_startup(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) { /* {{{ */
         char **auth;          char **auth;
         php_cli_server_client_populate_request_info(client, &SG(request_info));          php_cli_server_client_populate_request_info(client, &SG(request_info));
        if (SUCCESS == zend_hash_find(&client->request.headers, "Authorization", sizeof("Authorization"), (void**)&auth)) {        if (SUCCESS == zend_hash_find(&client->request.headers, "authorization", sizeof("authorization"), (void**)&auth)) {
                 php_handle_auth_data(*auth TSRMLS_CC);                  php_handle_auth_data(*auth TSRMLS_CC);
         }          }
         SG(sapi_headers).http_response_code = 200;          SG(sapi_headers).http_response_code = 200;
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

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