--- embedaddon/php/main/php_logos.c 2012/02/21 23:48:05 1.1.1.1 +++ embedaddon/php/main/php_logos.c 2012/05/29 12:34:35 1.1.1.2 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_logos.c,v 1.1.1.1 2012/02/21 23:48:05 misho Exp $ */ +/* $Id: php_logos.c,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */ #include "php.h" #include "logos.h" @@ -50,10 +50,6 @@ PHPAPI int php_unregister_info_logo(char *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) { if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) @@ -62,9 +58,7 @@ 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_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)); -#if SUHOSIN_PATCH - php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo , sizeof(suhosin_logo)); -#endif + return SUCCESS; } @@ -91,7 +85,7 @@ int php_info_logos(const char *logo_string TSRMLS_DC) 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; }