re-package, 2.2.1

laruence · Sep 7, 2012 · 391d39e · 391d39e
1 parent 7b9df10
commit 391d39e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 27 deletions.
diff --git a/package2.xml b/package2.xml
@@ -11,28 +11,18 @@
   <active>yes</active>
  </lead>
  <date>2012-09-07</date>
- <time>12:38:17</time>
+ <time>16:01:47</time>
  <version>
-  <release>2.2.0</release>
-  <api>2.2.0</api>
+  <release>2.2.1</release>
+  <api>2.2.1</api>
  </version>
  <stability>
   <release>beta</release>
   <api>beta</api>
  </stability>
  <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
-  - Implemented FR #62702 (Make baseuri case-insensitive)
-  - Implemented FR #62638 (Supports set yaf runtime configuration via application.ini)
+  - Repackage, previous one missed one fix
  </notes>
  <contents> 
   <dir name="/"> 
@@ -150,6 +140,8 @@
     <file name="046.phpt" role="test" />
     <file name="047.phpt" role="test" />
     <file name="048.phpt" role="test" />
+    <file name="049.phpt" role="test" />
+    <file name="050.phpt" role="test" />
     <file name="build.inc" role="test" />
     <file name="bug61493.phpt" role="test" />
     <file name="simple.ini" role="test" />
@@ -171,7 +163,23 @@
  <extsrcrelease />
  <changelog> 
   <release> 
-   <date>2012-09-02</date> 
+   <date>2012-09-07</date> 
+   <version> 
+    <release>2.2.0</release> 
+    <api>2.2.0</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes>
+    - Repackage, previous one missed one fix
+   </notes> 
+  </release> 
+
+  <release> 
+   <date>2012-09-07</date> 
    <version> 
     <release>2.2.0</release> 
     <api>2.2.0</api> 
@@ -183,14 +191,18 @@
    <license uri="http://www.php.net/license">PHP License</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
     - Implemented FR #62702 (Make baseuri case-insensitive)
     - Implemented FR #62638 (Supports set yaf runtime configuration via application.ini)
    </notes> 
   </release> 
-
   <release> 
    <date>2012-07-12</date> 
    <version> 

diff --git a/php_yaf.h b/php_yaf.h
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_yaf.h 327517 2012-09-07 04:52:14Z laruence $ */
+/* $Id: php_yaf.h 327521 2012-09-07 08:02:47Z 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.1-dev"
+#define YAF_VERSION 					"2.2.1"
 
 #define YAF_STARTUP_FUNCTION(module)   	ZEND_MINIT_FUNCTION(yaf_##module)
 #define YAF_RINIT_FUNCTION(module)		ZEND_RINIT_FUNCTION(yaf_##module)

diff --git a/yaf_loader.c b/yaf_loader.c
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: yaf_loader.c 327515 2012-09-07 04:38:21Z laruence $ */
+/* $Id: yaf_loader.c 327520 2012-09-07 07:59:08Z laruence $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -366,6 +366,7 @@ static void yaf_suppress_include_warning(int error_num, const char *error_filena
 int yaf_loader_import(char *path, int len, int use_path TSRMLS_DC) {
 	zend_file_handle file_handle;
 	zend_op_array 	*op_array;
+	zend_bool       restore_cb = 0;
 
 	file_handle.filename = path;
 	file_handle.free_filename = 0;
@@ -374,21 +375,26 @@ int yaf_loader_import(char *path, int len, int use_path TSRMLS_DC) {
 	file_handle.handle.fp = NULL;
 
 	if (!zend_origin_error_handler) {
+		restore_cb = 1;
 		zend_origin_error_handler = zend_error_cb;
+	    zend_error_cb = yaf_suppress_include_warning;
+	    YAF_G(suppressing_warning) = 1;
 	}
-	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;
+		if (restore_cb) {
+		    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 (restore_cb) {
+	    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;