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

Diff for /embedaddon/php/main/php_logos.c between versions 1.1 and 1.1.1.4

version 1.1, 2012/02/21 23:48:05 version 1.1.1.4, 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 50  PHPAPI int php_unregister_info_logo(char *logo_string) Line 50  PHPAPI int php_unregister_info_logo(char *logo_string)
         return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));          return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
 }  }
   
 #if SUHOSIN_PATCH  
 #include "suhosin_logo.h"  
 #endif  
   
 int php_init_info_logos(void)  int php_init_info_logos(void)
 {  {
         if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE)           if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) 
Line 62  int php_init_info_logos(void) Line 58  int php_init_info_logos(void)
         php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));          php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));
         php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));          php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
         php_register_info_logo(ZEND_LOGO_GUID   , "image/gif", zend_logo   , sizeof(zend_logo));          php_register_info_logo(ZEND_LOGO_GUID   , "image/gif", zend_logo   , sizeof(zend_logo));
#if SUHOSIN_PATCH
        php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo   , sizeof(suhosin_logo)); 
#endif 
         return SUCCESS;          return SUCCESS;
 }  }
   
Line 91  int php_info_logos(const char *logo_string TSRMLS_DC) Line 85  int php_info_logos(const char *logo_string TSRMLS_DC)
         content_header[len] = '\0';          content_header[len] = '\0';
         sapi_add_header(content_header, len, 0);          sapi_add_header(content_header, len, 0);
   
        PHPWRITE(logo_image->data, logo_image->size);        PHPWRITE((char*)logo_image->data, logo_image->size);
         return 1;          return 1;
 }  }
   
Removed from v.1.1  
changed lines
  Added in v.1.1.1.4

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