X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-apfd;a=blobdiff_plain;f=php_apfd.c;h=84c6b8cc32042d9745d91daf191ec4955160ad11;hp=da178eb7b3ab65bd0a9f77e1e9136666bd97f730;hb=HEAD;hpb=39d9936c61018c60d831d52896a7ee738952180e

diff --git a/php_apfd.c b/php_apfd.c
index da178eb..84c6b8c 100644
--- a/php_apfd.c
+++ b/php_apfd.c
@@ -19,8 +19,11 @@
 #include "ext/standard/info.h"
 #include "SAPI.h"
 #include "rfc1867.h"
+#include "php_content_types.h"
 #include "php_apfd.h"
 
+typedef void (*apfd_enumerate_post_entry_fn)(sapi_post_entry *);
+
 #if PHP_VERSION_ID >= 70000
 
 struct apfd {
@@ -34,6 +37,17 @@ static inline sapi_post_entry *apfd_get_post_entry(const char *ct_str, size_t ct
 	return zend_hash_str_find_ptr(&SG(known_post_content_types), ct_str, ct_len);
 }
 
+static inline void apfd_enumerate_post_entries(apfd_enumerate_post_entry_fn fn)
+{
+	sapi_post_entry *pe;
+
+	ZEND_HASH_FOREACH_PTR(&SG(known_post_content_types), pe)
+	{
+		fn(pe);
+	}
+	ZEND_HASH_FOREACH_END();
+}
+
 static inline void apfd_backup(struct apfd *apfd)
 {
 	if (SG(rfc1867_uploaded_files)) {
@@ -76,6 +90,21 @@ static inline sapi_post_entry *apfd_get_post_entry(const char *ct_str, size_t ct
 	return NULL;
 }
 
+static inline void apfd_enumerate_post_entries(apfd_enumerate_post_entry_fn fn TSRMLS_DC)
+{
+	HashPosition pos;
+	HashTable *ht = &SG(known_post_content_types);
+	sapi_post_entry *pe;
+
+	for (
+		zend_hash_internal_pointer_reset_ex(ht, &pos);
+		zend_hash_get_current_data_ex(ht, (void **) &pe, &pos) == SUCCESS;
+		zend_hash_move_forward_ex(ht, &pos)
+	) {
+		fn(pe);
+	}
+}
+
 static inline void apfd_backup(struct apfd *apfd TSRMLS_DC)
 {
 	apfd->post = APFD_SG(TRACK_VARS_POST);
@@ -96,13 +125,20 @@ static inline void apfd_update(struct apfd *apfd TSRMLS_DC)
 
 PHP_RINIT_FUNCTION(apfd)
 {
+#ifndef TSRMLS_C
+# define TSRMLS_C
+# define TSRMLS_CC
+#endif
+
+	sapi_request_info *req = &SG(request_info);
+
 	/* populate form data on non-POST requests */
-	if (SG(request_info).request_method && strcasecmp(SG(request_info).request_method, "POST") && SG(request_info).content_type && *SG(request_info).content_type) {
-		char *ct_str, *ct_dup = estrdup(SG(request_info).content_type);
+	if (req->request_method && strcasecmp(req->request_method, "POST") && req->content_type && *req->content_type) {
+		char *ct_str, *ct_dup = estrdup(req->content_type);
 		size_t ct_end = strcspn(ct_dup, ";, ");
 		sapi_post_entry *post_entry = NULL;
 
-		SG(request_info).content_type_dup = ct_dup;
+		req->content_type_dup = ct_dup;
 
 		ct_str = zend_str_tolower_dup(ct_dup, ct_end);
 		if ((post_entry = apfd_get_post_entry(ct_str, ct_end TSRMLS_CC))) {
@@ -110,7 +146,7 @@ PHP_RINIT_FUNCTION(apfd)
 
 			apfd_backup(&apfd TSRMLS_CC);
 
-			SG(request_info).post_entry = post_entry;
+			req->post_entry = post_entry;
 
 			if (post_entry->post_reader) {
 				post_entry->post_reader(TSRMLS_C);
@@ -126,19 +162,33 @@ PHP_RINIT_FUNCTION(apfd)
 		}
 		efree(ct_str);
 
-		if (SG(request_info).content_type_dup) {
-			efree(SG(request_info).content_type_dup);
-			SG(request_info).content_type_dup = NULL;
+		if (req->content_type_dup) {
+			efree(req->content_type_dup);
+			req->content_type_dup = NULL;
 		}
 	}
 
 	return SUCCESS;
 }
 
+#define CUSTOM_OR_DEFAULT(ptr, def) ((ptr) && ((ptr) != (def)) ? "custom" : "default")
+static void apfd_enumerate_post_entry(sapi_post_entry *pe)
+{
+	php_info_print_table_row(3, pe->content_type,
+		CUSTOM_OR_DEFAULT(pe->post_reader, sapi_read_standard_form_data),
+		CUSTOM_OR_DEFAULT(pe->post_handler, php_std_post_handler)
+	);
+}
+
 PHP_MINFO_FUNCTION(apfd)
 {
 	php_info_print_table_start();
-	php_info_print_table_header(2, "apfd support", "enabled");
+	php_info_print_table_header(2, "APFD Support", "enabled");
+	php_info_print_table_row(2, "Extension Version", PHP_APFD_VERSION);
+	php_info_print_table_end();
+	php_info_print_table_start();
+	php_info_print_table_header(3, "Content type", "Reader", "Handler");
+	apfd_enumerate_post_entries(apfd_enumerate_post_entry TSRMLS_CC);
 	php_info_print_table_end();
 }