Added initial headers support in SAPI

*untested*
It definitely broke the thread-safe CGI, it may have broken other stuff as well.

1 files changed, 88 insertions, 1 deletions

diff --git a/main/SAPI.c b/main/SAPI.c
index bdb58baed4..c107365366 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -3,6 +3,12 @@
 #include "TSRM.h"
 #endif
 
+#if WIN32||WINNT
+#define STRCASECMP stricmp
+#else
+#define STRCASECMP strcasecmp
+#endif
+
 
 #ifdef ZTS
 SAPI_API int sapi_globals_id;
@@ -10,13 +16,94 @@ SAPI_API int sapi_globals_id;
 sapi_globals_struct sapi_globals;
 #endif
 
+
 /* A true global (no need for thread safety) */
 sapi_module_struct sapi_module;
 
+
 SAPI_API void sapi_startup(sapi_module_struct *sf)
 {
 	sapi_module = *sf;
 #ifdef ZTS
 	sapi_globals_id = ts_allocate_id(sizeof(sapi_globals_struct), NULL, NULL);
 #endif
-}
\ No newline at end of file
+}
+
+
+static void sapi_free_header(sapi_header_struct *sapi_header)
+{
+	efree(sapi_header->header);
+}
+
+
+SAPI_API void sapi_activate(SLS_D)
+{
+	zend_llist_init(&SG(sapi_headers).headers, sizeof(sapi_header_struct), (void (*)(void *)) sapi_free_header, 0);
+	SG(sapi_headers).content_type.header = NULL;
+	SG(sapi_headers).http_response_code = 200;
+}
+
+
+SAPI_API void sapi_deactivate(SLS_D)
+{
+	zend_llist_destroy(&SG(sapi_headers).headers);
+}
+
+
+/* This function expects a *duplicated* string, that was previously emalloc()'d.
+ * Pointers sent to this functions will be automatically freed by the framework.
+ */
+SAPI_API int sapi_add_header(const char *header_line, uint header_line_len)
+{
+	int retval;
+	sapi_header_struct sapi_header;
+	SLS_FETCH();
+
+	sapi_header.header = (char *) header_line;
+	sapi_header.header_len = header_line_len;
+
+	retval = sapi_module.header_handler(&sapi_header, &SG(sapi_headers));
+
+	if (retval & SAPI_HEADER_DELETE_ALL) {
+		zend_llist_clean(&SG(sapi_headers).headers);
+	}
+	if (retval & SAPI_HEADER_ADD) {
+		char *colon_offset = strchr(header_line, ':');
+
+		if (colon_offset) {
+			*colon_offset = 0;
+			if (!STRCASECMP(header_line, "Content-Type")) {
+				if (SG(sapi_headers).content_type.header) {
+					efree(SG(sapi_headers).content_type.header);
+				}
+				*colon_offset = ':';
+				SG(sapi_headers).content_type.header = (char *) header_line;
+				SG(sapi_headers).content_type.header_len = header_line_len;
+				return SUCCESS;
+			}
+			*colon_offset = ':';
+		}
+		zend_llist_add_element(&SG(sapi_headers).headers, (void *) &sapi_header);
+	}
+	return SUCCESS;
+}
+
+
+SAPI_API int sapi_send_headers()
+{
+	SLS_FETCH();
+
+	switch (sapi_module.send_headers(&SG(sapi_headers) SLS_CC)) {
+		case SAPI_HEADER_SENT_SUCCESSFULLY:
+			return SUCCESS;
+			break;
+		case SAPI_HEADER_DO_SEND:
+			zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void *)) sapi_module.send_header, SG(server_context));
+			return SUCCESS;
+			break;
+		case SAPI_HEADER_SEND_FAILED:
+			return FAILURE;
+			break;
+	}
+	return FAILURE;
+}