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

Diff for /embedaddon/php/main/php_variables.c between versions 1.1.1.2 and 1.1.1.5

version 1.1.1.2, 2012/05/29 12:34:35 version 1.1.1.5, 2014/06/15 20:04:01
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 56  PHPAPI void php_register_variable_safe(char *var, char Line 56  PHPAPI void php_register_variable_safe(char *var, char
 PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars_array TSRMLS_DC)  PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars_array TSRMLS_DC)
 {  {
         char *p = NULL;          char *p = NULL;
        char *ip;               /* index pointer */        char *ip = NULL;               /* index pointer */
         char *index;          char *index;
         char *var, *var_orig;          char *var, *var_orig;
         int var_len, index_len;          int var_len, index_len;
Line 519  static void php_build_argv(char *s, zval *track_vars_a Line 519  static void php_build_argv(char *s, zval *track_vars_a
                 Z_ADDREF_P(arr);                  Z_ADDREF_P(arr);
                 Z_ADDREF_P(argc);                  Z_ADDREF_P(argc);
                 zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL);                  zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(zval *), NULL);
                zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(zval *), NULL);                zend_hash_update(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(zval *), NULL);
         }           } 
         if (track_vars_array) {          if (track_vars_array) {
                 Z_ADDREF_P(arr);                  Z_ADDREF_P(arr);
Line 636  static zend_bool php_auto_globals_create_request(const Line 636  static zend_bool php_auto_globals_create_request(const
   
 /* {{{ php_hash_environment  /* {{{ php_hash_environment
  */   */
int php_hash_environment(TSRMLS_D)PHPAPI int php_hash_environment(TSRMLS_D)
 {  {
         memset(PG(http_globals), 0, sizeof(PG(http_globals)));          memset(PG(http_globals), 0, sizeof(PG(http_globals)));
         zend_activate_auto_globals(TSRMLS_C);          zend_activate_auto_globals(TSRMLS_C);
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.5

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