3 files changed, 13 insertions, 4 deletions

diff --git a/post_handler.c b/post_handler.c
index 7c03892..fb1bb29 100644
--- a/post_handler.c
+++ b/post_handler.c
@@ -83,7 +83,7 @@ last_value:
 static void suhosin_post_handler_modification(sapi_post_entry *spe)
 {
         char *content_type = estrndup(spe->content_type, spe->content_type_len);
-        suhosin_log(S_VARS, "some extension replaces the POST handler for %s - Suhosin's protection will be incomplete", content_type);
+        suhosin_log(S_VARS, "some extension replaces the POST handler for %s - Suhosin's protection might be incomplete", content_type);
         efree(content_type);
 }
 
@@ -135,7 +135,13 @@ void suhosin_hook_post_handlers(TSRMLS_D)
 {
         HashTable tempht;
         zend_ini_entry *ini_entry;
-        
+
+        old_rfc1867_callback = php_rfc1867_callback;
+
+#if PHP_VERSION_ID >= 50400
+        /* the RFC1867 code is now good enough in PHP to handle our filter just as a registered callback */
+        php_rfc1867_callback = suhosin_rfc1867_filter;
+#else   
 #if PHP_MAJOR_VERSION > 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0)
         sapi_unregister_post_entry(&suhosin_post_entries[0] TSRMLS_CC);
         sapi_unregister_post_entry(&suhosin_post_entries[1] TSRMLS_CC);
@@ -145,6 +151,7 @@ void suhosin_hook_post_handlers(TSRMLS_D)
         sapi_unregister_post_entry(&suhosin_post_entries[1]);
         sapi_register_post_entries(suhosin_post_entries);
 #endif
+#endif
         /* we want to get notified if another extension deregisters the suhosin post handlers */
 
         /* we need to tell suhosin patch that there is a new valid destructor */
diff --git a/suhosin_rfc1867.h b/suhosin_rfc1867.h
index 170b3f9..b4fdea0 100644
--- a/suhosin_rfc1867.h
+++ b/suhosin_rfc1867.h
@@ -79,6 +79,7 @@ typedef struct _multipart_event_end {
 SAPI_POST_HANDLER_FUNC(suhosin_rfc1867_post_handler);
 
 void destroy_uploaded_files_hash(TSRMLS_D);
+extern PHP_SUHOSIN_API int (*old_rfc1867_callback)(unsigned int event, void *event_data, void **extra TSRMLS_DC);
 #if !HAVE_RFC1867_CALLBACK
 extern PHP_SUHOSIN_API int (*php_rfc1867_callback)(unsigned int event, void *event_data, void **extra TSRMLS_DC);
 #else
diff --git a/ufilter.c b/ufilter.c
index 5e23ff9..6584617 100644
--- a/ufilter.c
+++ b/ufilter.c
@@ -31,6 +31,7 @@
 #include "php_variables.h"
 #include "suhosin_rfc1867.h"
 
+PHP_SUHOSIN_API int (*old_rfc1867_callback)(unsigned int event, void *event_data, void **extra TSRMLS_DC) = NULL;
 #if !HAVE_RFC1867_CALLBACK
 PHP_SUHOSIN_API int (*php_rfc1867_callback)(unsigned int event, void *event_data, void **extra TSRMLS_DC) = NULL;
 #endif
@@ -345,8 +346,8 @@ int suhosin_rfc1867_filter(unsigned int event, void *event_data, void **extra TS
         }
 continue_with_next:     
 #if HAVE_RFC1867_CALLBACK
-        if (php_rfc1867_callback != NULL) {
-                return php_rfc1867_callback(event, event_data, extra TSRMLS_CC);
+        if (old_rfc1867_callback != NULL) {
+                return old_rfc1867_callback(event, event_data, extra TSRMLS_CC);
         }
 #endif
         return SUCCESS;