- Break the zend->PHP dependency introduced by the .php extension for use(),

  by providing an API
- Enable Stig's patch for use() extensions (it wasn't refered to by the parser)
- Fix a memory leak in that code

1 files changed, 3 insertions, 2 deletions

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index c3ae28421e..18748fdabb 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -177,6 +177,7 @@ typedef struct _zend_file_handle {
 		istream *is;
 #endif
 	} handle;
+	zend_bool free_filename;
 } zend_file_handle;
 
 
@@ -346,8 +347,8 @@ void do_extended_fcall_end(CLS_D);
 /* helper functions in zend-scanner.l */
 BEGIN_EXTERN_C()
 ZEND_API int require_file(zend_file_handle *file_handle, zend_bool unique CLS_DC);	
-ZEND_API int require_filename(char *filename, zend_bool unique CLS_DC);
-ZEND_API int use_filename(char *filename, zend_bool unique CLS_DC);
+ZEND_API int require_filename(char *filename CLS_DC);
+ZEND_API int use_filename(char *filename, uint filename_length CLS_DC);
 ZEND_API zend_op_array *compile_files(int mark_as_ref CLS_DC, int file_count, ...);
 ZEND_API zend_op_array *v_compile_files(int mark_as_ref CLS_DC, int file_count, va_list files);
 ZEND_API zend_op_array *compile_string(zval *source_string CLS_DC);