cvs: php4 /main SAPI.c SAPI.h php_content_types.c php_content_types.h php_variables.c rfc1867.c rfc1867.h
| From: | Daniel Beulshausen | Date: | Wed, 15 Aug 2001 18:01:52 +0000 |
| Subject: | cvs: php4 /main SAPI.c SAPI.h php_content_types.c php_content_types.h php_variables.c rfc1867.c rfc1867.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6866@lists.php.net to get a copy of this message | ||
dbeu Wed Aug 15 14:01:52 2001 EDT
Modified files:
/php4/main SAPI.c SAPI.h php_content_types.c php_content_types.h
php_variables.c rfc1867.c rfc1867.h
Log:
fix SAPI_POST_* exports
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.113 php4/main/SAPI.c:1.114
--- php4/main/SAPI.c:1.113 Sun Aug 5 11:29:39 2001
+++ php4/main/SAPI.c Wed Aug 15 14:01:48 2001
@@ -165,7 +165,7 @@
}
-SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
+SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data)
{
int read_bytes;
int allocated_bytes=SAPI_POST_BLOCK_SIZE+1;
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.75 php4/main/SAPI.h:1.76
--- php4/main/SAPI.h:1.75 Tue Aug 14 18:57:09 2001
+++ php4/main/SAPI.h Wed Aug 15 14:01:48 2001
@@ -207,11 +207,11 @@
#define SAPI_DEFAULT_CHARSET ""
#define SAPI_PHP_VERSION_HEADER "X-Powered-By: PHP/" PHP_VERSION
-#define SAPI_POST_READER_FUNC(post_reader) SAPI_API void post_reader(TSRMLS_D)
-#define SAPI_POST_HANDLER_FUNC(post_handler) SAPI_API void post_handler(char *content_type_dup,
void *arg TSRMLS_DC)
+#define SAPI_POST_READER_FUNC(post_reader) void post_reader(TSRMLS_D)
+#define SAPI_POST_HANDLER_FUNC(post_handler) void post_handler(char *content_type_dup, void *arg
TSRMLS_DC)
-SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
-SAPI_POST_READER_FUNC(php_default_post_reader);
+SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
+SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
#define STANDARD_SAPI_MODULE_PROPERTIES NULL
Index: php4/main/php_content_types.c
diff -u php4/main/php_content_types.c:1.15 php4/main/php_content_types.c:1.16
--- php4/main/php_content_types.c:1.15 Sat Aug 4 21:42:44 2001
+++ php4/main/php_content_types.c Wed Aug 15 14:01:48 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_content_types.c,v 1.15 2001/08/05 01:42:44 zeev Exp $ */
+/* $Id: php_content_types.c,v 1.16 2001/08/15 18:01:48 dbeu Exp $ */
#include "php.h"
#include "SAPI.h"
@@ -35,7 +35,7 @@
/* {{{ SAPI_POST_READER_FUNC
*/
-SAPI_POST_READER_FUNC(php_default_post_reader)
+SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader)
{
char *data;
Index: php4/main/php_content_types.h
diff -u php4/main/php_content_types.h:1.5 php4/main/php_content_types.h:1.6
--- php4/main/php_content_types.h:1.5 Sun Jul 2 19:46:50 2000
+++ php4/main/php_content_types.h Wed Aug 15 14:01:48 2001
@@ -3,8 +3,8 @@
#define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded"
-SAPI_POST_READER_FUNC(php_default_post_reader);
-SAPI_POST_HANDLER_FUNC(php_std_post_handler);
+SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
+SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler);
int php_startup_sapi_content_types(void);
#endif /* PHP_CONTENT_TYPES_H */
Index: php4/main/php_variables.c
diff -u php4/main/php_variables.c:1.30 php4/main/php_variables.c:1.31
--- php4/main/php_variables.c:1.30 Sun Aug 5 23:50:52 2001
+++ php4/main/php_variables.c Wed Aug 15 14:01:48 2001
@@ -16,7 +16,7 @@
| Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.c,v 1.30 2001/08/06 03:50:52 sas Exp $ */
+/* $Id: php_variables.c,v 1.31 2001/08/15 18:01:48 dbeu Exp $ */
#include <stdio.h>
#include "php.h"
@@ -191,7 +191,7 @@
}
-SAPI_POST_HANDLER_FUNC(php_std_post_handler)
+SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)
{
char *var, *val;
char *strtok_buf = NULL;
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.71 php4/main/rfc1867.c:1.72
--- php4/main/rfc1867.c:1.71 Sat Aug 4 21:42:44 2001
+++ php4/main/rfc1867.c Wed Aug 15 14:01:48 2001
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf <rasmus@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.71 2001/08/05 01:42:44 zeev Exp $ */
+/* $Id: rfc1867.c,v 1.72 2001/08/15 18:01:48 dbeu Exp $ */
#include <stdio.h>
#include "php.h"
@@ -443,7 +443,7 @@
}
-SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
+SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
{
char *boundary;
uint boundary_len;
Index: php4/main/rfc1867.h
diff -u php4/main/rfc1867.h:1.6 php4/main/rfc1867.h:1.7
--- php4/main/rfc1867.h:1.6 Sat Jul 28 07:36:28 2001
+++ php4/main/rfc1867.h Wed Aug 15 14:01:48 2001
@@ -5,8 +5,8 @@
#define MULTIPART_CONTENT_TYPE "multipart/form-data"
-SAPI_POST_READER_FUNC(rfc1867_post_reader);
-SAPI_POST_HANDLER_FUNC(rfc1867_post_handler);
+SAPI_API SAPI_POST_READER_FUNC(rfc1867_post_reader);
+SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler);
#define FILE_UPLOAD_INPUT_BUFFER_SIZE 8192