Index: Zend/zend_API.h
===================================================================
RCS file: /repository/ZendEngine2/zend_API.h,v
retrieving revision 1.207.2.8.2.8
diff -u -r1.207.2.8.2.8 zend_API.h
--- Zend/zend_API.h	16 Apr 2007 08:09:54 -0000	1.207.2.8.2.8
+++ Zend/zend_API.h	14 Sep 2007 16:37:53 -0000
@@ -54,6 +54,7 @@
 #define ZEND_NAMED_FE(zend_name, name, arg_info)	ZEND_FENTRY(zend_name, name, arg_info, 0)
 #define ZEND_FE(name, arg_info)						ZEND_FENTRY(name, ZEND_FN(name), arg_info, 0)
 #define ZEND_DEP_FE(name, arg_info)                 ZEND_FENTRY(name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
+#define ZEND_CONST_FE(name, arg_info)                 ZEND_FENTRY(name, ZEND_FN(name), arg_info, ZEND_ACC_CONST)
 #define ZEND_FALIAS(name, alias, arg_info)			ZEND_FENTRY(name, ZEND_FN(alias), arg_info, 0)
 #define ZEND_DEP_FALIAS(name, alias, arg_info)		ZEND_FENTRY(name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED)
 #define ZEND_NAMED_ME(zend_name, name, arg_info, flags)	ZEND_FENTRY(zend_name, name, arg_info, flags)
Index: Zend/zend_compile.h
===================================================================
RCS file: /repository/ZendEngine2/zend_compile.h,v
retrieving revision 1.316.2.8.2.12
diff -u -r1.316.2.8.2.12 zend_compile.h
--- Zend/zend_compile.h	18 May 2007 13:12:04 -0000	1.316.2.8.2.12
+++ Zend/zend_compile.h	14 Sep 2007 16:37:53 -0000
@@ -143,6 +143,9 @@
 /* deprecation flag */
 #define ZEND_ACC_DEPRECATED 0x40000
 
+/* declares that a function returns a constant when given a constant argument */
+#define ZEND_ACC_CONST 0x80000
+
 char *zend_visibility_string(zend_uint fn_flags);
 
 
Index: ext/standard/basic_functions.c
===================================================================
RCS file: /repository/php-src/ext/standard/basic_functions.c,v
retrieving revision 1.725.2.31.2.64
diff -u -r1.725.2.31.2.64 basic_functions.c
--- ext/standard/basic_functions.c	6 Sep 2007 13:28:05 -0000	1.725.2.31.2.64
+++ ext/standard/basic_functions.c	14 Sep 2007 16:37:56 -0000
@@ -3188,12 +3188,12 @@
 	PHP_FE(strtr,															arginfo_strtr)
 	PHP_FE(addslashes,														arginfo_addslashes)
 	PHP_FE(addcslashes,														arginfo_addcslashes)
-	PHP_FE(rtrim,															arginfo_rtrim)
-	PHP_FE(str_replace,														arginfo_str_replace)
-	PHP_FE(str_ireplace,													arginfo_str_ireplace)
-	PHP_FE(str_repeat,														arginfo_str_repeat)
-	PHP_FE(count_chars,														arginfo_count_chars)
-	PHP_FE(chunk_split,														arginfo_chunk_split)
+	PHP_CONST_FE(rtrim,															arginfo_rtrim)
+	PHP_CONST_FE(str_replace,														arginfo_str_replace)
+	PHP_CONST_FE(str_ireplace,													arginfo_str_ireplace)
+	PHP_CONST_FE(str_repeat,														arginfo_str_repeat)
+	PHP_CONST_FE(count_chars,														arginfo_count_chars)
+	PHP_CONST_FE(chunk_split,														arginfo_chunk_split)
 	PHP_FE(trim,															arginfo_trim)
 	PHP_FE(ltrim,															arginfo_ltrim)
 	PHP_FE(strip_tags,														arginfo_strip_tags)
Index: main/php.h
===================================================================
RCS file: /repository/php-src/main/php.h,v
retrieving revision 1.221.2.4.2.8
diff -u -r1.221.2.4.2.8 php.h
--- main/php.h	31 Aug 2007 07:48:05 -0000	1.221.2.4.2.8
+++ main/php.h	14 Sep 2007 16:37:57 -0000
@@ -340,6 +340,7 @@
 #define PHP_NAMED_FE	ZEND_NAMED_FE
 #define PHP_FE			ZEND_FE
 #define PHP_DEP_FE      ZEND_DEP_FE
+#define PHP_CONST_FE	ZEND_CONST_FE
 #define PHP_FALIAS		ZEND_FALIAS
 #define PHP_DEP_FALIAS	ZEND_DEP_FALIAS
 #define PHP_ME          ZEND_ME