Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

maybe a bug

  • Loading branch information...
commit 58ea47fde1431b53a814b42ce657ceb1efaffa02 1 parent 05620ef
@laruence authored
View
5 package2.xml
@@ -23,6 +23,11 @@
<license uri="http://www.php.net/license">PHP</license>
<notes>
- Implemented Yaf_Response::setBody with key(which will make the layout easier to implement)
+ - New method Yaf_View_Simple::eval, Yaf_View_Simple::clear
+ - Support short open tag in view templates regardless of php.short_open_tag
+ - Make Yaf_Autoload faster(30%)
+ - Controller of default module can be autoloaded now
+ - Single class can be local class now (previous is a design issue)
- Performance improve in various place
- Compatible with php5.5, which droped PHP logo guid
- Fixed bug that Supervar should not respect the base_uri
View
5 php_yaf.h
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_yaf.h 327415 2012-09-01 13:58:02Z laruence $ */
+/* $Id: php_yaf.h 327512 2012-09-07 04:20:33Z laruence $ */
#ifndef PHP_YAF_H
#define PHP_YAF_H
@@ -41,7 +41,7 @@ extern zend_module_entry yaf_module_entry;
#define YAF_G(v) (yaf_globals.v)
#endif
-#define YAF_VERSION "2.2.0-dev"
+#define YAF_VERSION "2.2.0"
#define YAF_STARTUP_FUNCTION(module) ZEND_MINIT_FUNCTION(yaf_##module)
#define YAF_RINIT_FUNCTION(module) ZEND_RINIT_FUNCTION(yaf_##module)
@@ -101,6 +101,7 @@ ZEND_BEGIN_MODULE_GLOBALS(yaf)
zend_bool running;
zend_bool in_exception;
zend_bool catch_exception;
+ zend_bool suppressing_warning;
/* {{{ This only effects internally */
zend_bool st_compatible;
/* }}} */
View
1  yaf.c
@@ -100,6 +100,7 @@ PHP_GINIT_FUNCTION(yaf)
yaf_globals->bootstrap = YAF_DEFAULT_BOOTSTRAP;
yaf_globals->modules = NULL;
yaf_globals->default_route = NULL;
+ yaf_globals->suppressing_warning = 0;
}
/* }}} */
View
11 yaf_loader.c
@@ -325,7 +325,7 @@ yaf_loader_t * yaf_loader_instance(yaf_loader_t *this_ptr, char *library_path, c
*/
static void (*zend_origin_error_handler)(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args);
static void yaf_suppress_include_warning(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args) {
- if (error_num == E_WARNING) {
+ if (YAF_G(suppressing_warning) && error_num == E_WARNING) {
char buffer[1024];
int buffer_len, display;
va_list copy;
@@ -374,15 +374,22 @@ int yaf_loader_import(char *path, int len, int use_path TSRMLS_DC) {
file_handle.opened_path = NULL;
file_handle.handle.fp = NULL;
- zend_origin_error_handler = zend_error_cb;
+ if (!zend_origin_error_handler) {
+ zend_origin_error_handler = zend_error_cb;
+ }
zend_error_cb = yaf_suppress_include_warning;
+ YAF_G(suppressing_warning) = 1;
zend_try {
op_array = zend_compile_file(&file_handle, ZEND_INCLUDE TSRMLS_CC);
} zend_catch {
+ YAF_G(suppressing_warning) = 0;
zend_error_cb = zend_origin_error_handler;
+ zend_origin_error_handler = NULL;
zend_bailout();
} zend_end_try();
+ YAF_G(suppressing_warning) = 0;
zend_error_cb = zend_origin_error_handler;
+ zend_origin_error_handler = NULL;
if (op_array && file_handle.handle.stream.handle) {
int dummy = 1;
View
2  yaf_response.c
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: yaf_response.c 327455 2012-09-04 06:38:32Z laruence $ */
+/* $Id: yaf_response.c 327510 2012-09-07 04:16:31Z laruence $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
View
2  yaf_response.h
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: yaf_response.h 327425 2012-09-02 03:58:49Z laruence $ */
+/* $Id: yaf_response.h 327510 2012-09-07 04:16:31Z laruence $ */
#ifndef PHP_YAF_RESPONSE_H
#define PHP_YAF_RESPONSE_H
Please sign in to comment.
Something went wrong with that request. Please try again.