From 79904b9b080d1064c7893f1b1a85ebedf07332bc Mon Sep 17 00:00:00 2001
From: Pierre Joye <pajoye@php.net>
Date: Wed, 25 Oct 2006 17:23:45 +0000
Subject: [PATCH] - add test for callback with non modified var - update
 changelog

---
 ext/filter/package.xml                          | 11 +++++++----
 ext/filter/tests/callback_non_modified_var.phpt | 12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 ext/filter/tests/callback_non_modified_var.phpt

diff --git a/ext/filter/package.xml b/ext/filter/package.xml
index adef334630..09d43970f7 100644
--- a/ext/filter/package.xml
+++ b/ext/filter/package.xml
@@ -31,7 +31,7 @@ of filters and mechanisms that users can use to safely access their input data.
     <email>iliaa@php.net</email>
     <active>yes</active>
   </lead>
-  <date>2006-05-10</date>
+  <date>2006-25-10</date>
   <version>
     <release>0.11.0</release>
     <api>0.11.0</api>
@@ -41,11 +41,13 @@ of filters and mechanisms that users can use to safely access their input data.
     <api>beta</api>
   </stability>
   <license uri="http://www.php.net/license">PHP</license>
-  <notes>- Attention, this release contains BC breaks, the API has been rewamped
+  <notes>* Attention, this release contains BC breaks, the API has been rewamped *
+see the manuals and the examples for more details about the new API
 - Fixed possible bug in all filtering functions, input value was modified
 - Filters operate now on a copy of the data, allow to safely fetch multiple times the same values
-- add two modes: FILTER_REQUIRE_ARRAY and FILTER_FORCE_ARRAY
-- see the manuals and the examples for more details about the new API
+- Added three flags: FILTER_REQUIRE_ARRAY, FILTER_FORCE_ARRAY and FILTER_NULL_ON_FAILURE
+- Fixed a bug in FILTER_CALLBACK when a non modified value is returned
+- Improve support of _SERVER/_ENV (apache1 only)
 </notes>
   <contents>
     <dir name="/">
@@ -100,6 +102,7 @@ of filters and mechanisms that users can use to safely access their input data.
         <file role="test" name="bug7715.phpt"/>
         <file role="test" name="bug8315.phpt"/>
         <file role="test" name="bug7586.phpt"/>
+        <file role="test" name="callback_non_modified_var.phpt"/>
       </dir>
     </dir>
 <!-- / -->
diff --git a/ext/filter/tests/callback_non_modified_var.phpt b/ext/filter/tests/callback_non_modified_var.phpt
new file mode 100644
index 0000000000..6f1f8bf3d5
--- /dev/null
+++ b/ext/filter/tests/callback_non_modified_var.phpt
@@ -0,0 +1,12 @@
+--TEST--
+callback function returns non modified value
+--FILE--
+<?php
+function callback($var) {
+	return $var;
+}
+$var = "test";
+var_dump(filter_var($var, FILTER_CALLBACK, array('options'=>'callback')));
+?>
+--EXPECT--	
+string(4) "test"
-- 
2.40.0