summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-03-24 18:49:54 +0100
committerAnatol Belski <ab@php.net>2015-03-24 22:02:29 +0100
commit3066851dab531ac44a5debbf9b187277158dfcac (patch)
tree092734eba740968adfa12ce106ab0f679dea500d /main
parent62b51668e2018be4bef0f3e730df537a3ffb8ac1 (diff)
downloadphp-git-3066851dab531ac44a5debbf9b187277158dfcac.tar.gz
fix datatype mismatches
Diffstat (limited to 'main')
-rw-r--r--main/SAPI.c6
-rw-r--r--main/SAPI.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index d23907ce81..2757c2e521 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -595,7 +595,7 @@ static void sapi_update_response_code(int ncode)
* since zend_llist_del_element only remove one matched item once,
* we should remove them by ourself
*/
-static void sapi_remove_header(zend_llist *l, char *name, uint len) {
+static void sapi_remove_header(zend_llist *l, char *name, size_t len) {
sapi_header_struct *header;
zend_llist_element *next;
zend_llist_element *current=l->head;
@@ -623,7 +623,7 @@ static void sapi_remove_header(zend_llist *l, char *name, uint len) {
}
}
-SAPI_API int sapi_add_header_ex(char *header_line, uint header_line_len, zend_bool duplicate, zend_bool replace)
+SAPI_API int sapi_add_header_ex(char *header_line, size_t header_line_len, zend_bool duplicate, zend_bool replace)
{
sapi_header_line ctr = {0};
int r;
@@ -666,7 +666,7 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg)
sapi_header_struct sapi_header;
char *colon_offset;
char *header_line;
- uint header_line_len;
+ size_t header_line_len;
int http_response_code;
if (SG(headers_sent) && !SG(request_info).no_headers) {
diff --git a/main/SAPI.h b/main/SAPI.h
index a8485df773..e7a2721641 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -52,7 +52,7 @@
typedef struct {
char *header;
- uint header_len;
+ size_t header_len;
} sapi_header_struct;
@@ -169,7 +169,7 @@ END_EXTERN_C()
typedef struct {
char *line; /* If you allocated this, you need to free it yourself */
- uint line_len;
+ size_t line_len;
zend_long response_code; /* long due to zend_parse_parameters compatibility */
} sapi_header_line;
@@ -185,7 +185,7 @@ BEGIN_EXTERN_C()
SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg);
/* Deprecated functions. Use sapi_header_op instead. */
-SAPI_API int sapi_add_header_ex(char *header_line, uint header_line_len, zend_bool duplicate, zend_bool replace);
+SAPI_API int sapi_add_header_ex(char *header_line, size_t header_line_len, zend_bool duplicate, zend_bool replace);
#define sapi_add_header(a, b, c) sapi_add_header_ex((a),(b),(c),1)