[PHP4BETA] CVS update: php4
| From: | zeev | Date: | Tue, 25 May 1999 21:14:54 +0000 |
| Subject: | [PHP4BETA] CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1051@lists.php.net to get a copy of this message | ||
Date: Tuesday May 25, 1999 @ 17:14
Author: zeev
Update of /repository/php4
In directory php:/tmp/cvs-serv30069
Modified Files:
SAPI.c SAPI.h
Log Message:
* Add generic POST content-type support. Only application/x-www-form-urlencoded
supported at this time, but the framework allows for any other types, including
runtime addition of types.
Index: php4/SAPI.c
diff -u php4/SAPI.c:1.19 php4/SAPI.c:1.20
--- php4/SAPI.c:1.19 Fri May 21 19:25:46 1999
+++ php4/SAPI.c Tue May 25 17:14:53 1999
@@ -28,6 +28,18 @@
#endif
+static SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
+
+#define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded"
+
+static sapi_post_content_type_reader supported_post_content_types[] = {
+ { DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1, sapi_read_standard_form_data },
+ { NULL, 0, NULL }
+};
+
+
+static HashTable known_post_content_types;
+
SAPI_API void (*sapi_error)(int error_type, const char *message, ...);
@@ -45,7 +57,14 @@
SAPI_API void sapi_startup(sapi_module_struct *sf)
{
+ sapi_post_content_type_reader *post_content_type_reader=supported_post_content_types;
+
sapi_module = *sf;
+ zend_hash_init(&known_post_content_types, 5, NULL, NULL, 1);
+ while (post_content_type_reader->content_type) {
+ sapi_register_post_reader(post_content_type_reader);
+ post_content_type_reader++;
+ }
#ifdef ZTS
sapi_globals_id = ts_allocate_id(sizeof(sapi_globals_struct), NULL, NULL);
#endif
@@ -63,6 +82,22 @@
static void sapi_read_post_data(SLS_D)
{
+ sapi_post_content_type_reader *post_content_type_reader;
+ uint content_type_length = strlen(SG(request_info).content_type);
+ char *content_type = estrndup(SG(request_info).content_type, content_type_length);
+
+ zend_str_tolower(content_type, content_type_length);
+
+ if (zend_hash_find(&known_post_content_types, content_type, content_type_length+1, (void **)
&post_content_type_reader)==FAILURE) {
+ sapi_module.sapi_error(E_CORE_ERROR, "Unsupported content type: '%s'",
content_type);
+ return;
+ }
+ post_content_type_reader->post_reader(SLS_C);
+}
+
+
+static SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
+{
int read_bytes, total_read_bytes=0;
int allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
@@ -95,6 +130,13 @@
SG(headers_sent) = 0;
SG(read_post_bytes) = 0;
SG(request_info).post_data = NULL;
+
+ if (SG(request_info).request_method && !strcmp(SG(request_info).request_method,
"HEAD")) {
+ SG(request_info).headers_only = 1;
+ } else {
+ SG(request_info).headers_only = 0;
+ }
+
if (SG(server_context)) {
if (SG(request_info).request_method
&& !strcmp(SG(request_info).request_method, "POST")) {
@@ -102,11 +144,6 @@
}
SG(request_info).cookie_data = sapi_module.read_cookies(SLS_C);
}
- if (SG(request_info).request_method && !strcmp(SG(request_info).request_method,
"HEAD")) {
- SG(request_info).headers_only = 1;
- } else {
- SG(request_info).headers_only = 0;
- }
}
@@ -215,4 +252,10 @@
break;
}
return FAILURE;
+}
+
+
+SAPI_API int sapi_register_post_reader(sapi_post_content_type_reader *post_content_type_reader)
+{
+ return zend_hash_add(&known_post_content_types, post_content_type_reader->content_type,
post_content_type_reader->content_type_len+1, (void *) post_content_type_reader,
sizeof(sapi_post_content_type_reader), NULL);
}
Index: php4/SAPI.h
diff -u php4/SAPI.h:1.13 php4/SAPI.h:1.14
--- php4/SAPI.h:1.13 Tue May 11 16:38:13 1999
+++ php4/SAPI.h Tue May 25 17:14:54 1999
@@ -3,6 +3,7 @@
#include "zend.h"
#include "zend_llist.h"
+#include "zend_operators.h"
#define SAPI_POST_BLOCK_SIZE 4000
@@ -66,6 +67,13 @@
} sapi_globals_struct;
+typedef struct _sapi_post_content_type_reader {
+ char *content_type;
+ uint content_type_len;
+ void (*post_reader)(SLS_D);
+} sapi_post_content_type_reader;
+
+
#ifdef ZTS
# define SLS_D sapi_globals_struct *sapi_globals
# define SLS_DC , SLS_D
@@ -92,6 +100,8 @@
SAPI_API int sapi_add_header(char *header_line, uint header_line_len);
SAPI_API int sapi_send_headers();
+SAPI_API int sapi_register_post_reader(sapi_post_content_type_reader *post_content_type_reader);
+
struct _sapi_module_struct {
char *name;
@@ -111,7 +121,6 @@
};
-
/* header_handler() constants */
#define SAPI_HEADER_ADD (1<<0)
#define SAPI_HEADER_DELETE_ALL (1<<1)
@@ -123,5 +132,7 @@
#define SAPI_HEADER_SEND_FAILED 3
#define SAPI_DEFAULT_CONTENT_TYPE "Content-Type: text/html"
+
+#define SAPI_POST_READER_FUNC(post_reader) void post_reader(SLS_D)
#endif /* _NEW_SAPI_H */
--
PHP 4 Beta