From d473a48d670ccbb3ec69f0755d18d6be047cc590 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 17 Aug 2012 12:33:56 +0800 Subject: [PATCH] 1. Fixed issues #4 2. Compatible with php trunk --- CREDITS | 2 +- php_yaf.h | 3 +-- routes/static.c | 4 ++-- yaf.c | 7 +++++-- yaf_config.c | 4 ++-- yaf_logo.h | 43 +++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 52 insertions(+), 11 deletions(-) diff --git a/CREDITS b/CREDITS index 29fb2153..196edf6f 100644 --- a/CREDITS +++ b/CREDITS @@ -1,2 +1,2 @@ Yaf -Xinchen Hui +Xinchen Hui diff --git a/php_yaf.h b/php_yaf.h index 41220b44..0d45010c 100644 --- a/php_yaf.h +++ b/php_yaf.h @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaf.h 326615 2012-07-12 09:10:29Z laruence $ */ +/* $Id: php_yaf.h 327064 2012-08-12 03:04:55Z laruence $ */ #ifndef PHP_YAF_H #define PHP_YAF_H @@ -73,7 +73,6 @@ extern zend_module_entry yaf_module_entry; #define yaf_session_t zval #define yaf_exception_t zval -extern PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size); extern PHPAPI void php_var_dump(zval **struc, int level TSRMLS_DC); extern PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC); diff --git a/routes/static.c b/routes/static.c index 0a3f2ea3..02703a41 100644 --- a/routes/static.c +++ b/routes/static.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: static.c 326904 2012-07-31 15:00:05Z laruence $ */ +/* $Id: static.c 327068 2012-08-12 08:04:53Z laruence $ */ zend_class_entry * yaf_route_static_ce; @@ -196,7 +196,7 @@ zend_function_entry yaf_route_static_methods[] = { YAF_STARTUP_FUNCTION(route_static) { zend_class_entry ce; - YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Static", "Yaf\\Route\\Static", yaf_route_static_methods); + YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Static", "Yaf\\Route_Static", yaf_route_static_methods); yaf_route_static_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); zend_class_implements(yaf_route_static_ce TSRMLS_CC, 1, yaf_router_ce); diff --git a/yaf.c b/yaf.c index c01e2516..e44d20a6 100644 --- a/yaf.c +++ b/yaf.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf.c 325605 2012-05-09 07:16:31Z laruence $ */ +/* $Id: yaf.c 327064 2012-08-12 03:04:55Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -100,7 +100,9 @@ PHP_MINIT_FUNCTION(yaf) { REGISTER_INI_ENTRIES(); +#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 5 php_register_info_logo(YAF_LOGO_GUID, YAF_LOGO_MIME_TYPE, yaf_logo, sizeof(yaf_logo)); +#endif #ifdef YAF_HAVE_NAMESPACE if(YAF_G(use_namespace)) { @@ -232,12 +234,13 @@ PHP_RSHUTDOWN_FUNCTION(yaf) PHP_MINFO_FUNCTION(yaf) { php_info_print_table_start(); - if (PG(expose_php)) { + if (PG(expose_php) && !sapi_module.phpinfo_as_text) { php_info_print_table_header(2, "yaf support", YAF_LOGO_IMG"enabled"); } else { php_info_print_table_header(2, "yaf support", "enabled"); } + php_info_print_table_row(2, "Version", YAF_VERSION); php_info_print_table_row(2, "Supports", YAF_SUPPORT_URL); php_info_print_table_end(); diff --git a/yaf_config.c b/yaf_config.c index cc1c6db4..4e16b512 100644 --- a/yaf_config.c +++ b/yaf_config.c @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_config.c 325800 2012-05-25 03:25:11Z laruence $ */ +/* $Id: yaf_config.c 327093 2012-08-13 06:04:16Z laruence $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -55,7 +55,7 @@ static zval * yaf_config_ini_zval_losable(zval *zvalue TSRMLS_DC); */ static int yaf_config_ini_modified(zval * file, long ctime TSRMLS_DC) { zval n_ctime; - php_stat(Z_STRVAL_P(file), Z_STRLEN_P(file), 7 /*YAF_FS_CTIME*/ , &n_ctime TSRMLS_CC); + php_stat(Z_STRVAL_P(file), Z_STRLEN_P(file), 7 /* FS_CTIME */ , &n_ctime TSRMLS_CC); if (Z_TYPE(n_ctime) != IS_BOOL && ctime != Z_LVAL(n_ctime)) { return Z_LVAL(n_ctime); } diff --git a/yaf_logo.h b/yaf_logo.h index 63464e3b..50c8577f 100644 --- a/yaf_logo.h +++ b/yaf_logo.h @@ -14,16 +14,17 @@ +----------------------------------------------------------------------+ */ -/* $Id: yaf_logo.h 321289 2011-12-21 02:53:29Z laruence $ */ +/* $Id: yaf_logo.h 327064 2012-08-12 03:04:55Z laruence $ */ #ifndef YAF_LOGO_H #define YAF_LOGO_H +#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 5 #define YAF_LOGO_MIME_TYPE "image/png" #define YAF_LOGO_GUID "YAF-LOGO-LARUNECE-COM" #define YAF_SUPPORT_URL "http://pecl.php.net/package/yaf" #define YAF_LOGO_IMG " \ - \"Yaf\n" + \"Yaf\n" static const unsigned char yaf_logo[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, @@ -170,6 +171,44 @@ static const unsigned char yaf_logo[] = { 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82 }; +extern PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size); +#else +#define YAF_LOGO_BASE64 "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" +#define YAF_LOGO_DATA "data:image/png;base64," YAF_LOGO_BASE64 +#define YAF_SUPPORT_URL "http://pecl.php.net/package/yaf" +#define YAF_LOGO_IMG " \ + \"Yaf\n" + +#endif #endif /*