[prev in list] [next in list] [prev in thread] [next in thread]
List: pecl-cvs
Subject: [PECL-CVS] cvs: pecl /http http_cookie_api.c http_filter_api.c http_info_api.c http_response_object.
From: "Michael Wallner" <mike () php ! net>
Date: 2006-02-27 14:35:04
Message-ID: cvsmike1141050904 () cvsserver
[Download RAW message or body]
mike Mon Feb 27 14:35:04 2006 UTC
Modified files:
/pecl/http http_cookie_api.c http_filter_api.c http_info_api.c
http_response_object.c php_http_cache_api.h
php_http_cookie_api.h php_http_deflatestream_object.h
php_http_encoding_api.h php_http_headers_api.h
php_http_inflatestream_object.h php_http_info_api.h
php_http_message_api.h php_http_message_object.h
php_http_querystring_object.h php_http_request_api.h
php_http_request_body_api.h
php_http_request_method_api.h php_http_request_object.h
php_http_request_pool_api.h
php_http_requestpool_object.h php_http_send_api.h
/pecl/http/phpstr phpstr.h
/pecl/http/tests request_cookies.phpt
Log:
- ditch warnings
- give anonymous types a name
["mike-20060227143504.txt" (text/plain)]
http://cvs.php.net/viewcvs.cgi/pecl/http/http_cookie_api.c?r1=1.4&r2=1.5&diff_format=u
Index: pecl/http/http_cookie_api.c
diff -u pecl/http/http_cookie_api.c:1.4 pecl/http/http_cookie_api.c:1.5
--- pecl/http/http_cookie_api.c:1.4 Wed Feb 15 18:44:12 2006
+++ pecl/http/http_cookie_api.c Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: http_cookie_api.c,v 1.4 2006/02/15 18:44:12 mike Exp $ */
+/* $Id: http_cookie_api.c,v 1.5 2006/02/27 14:35:04 mike Exp $ */
#include "php_http.h"
#include "php_http_api.h"
@@ -66,7 +66,7 @@
PHP_HTTP_API const char *_http_cookie_list_get_cookie(http_cookie_list *list, const \
char *name, size_t name_len TSRMLS_DC) {
zval **cookie = NULL;
- if ((SUCCESS != zend_hash_find(&list->cookies, name, name_len + 1, (void **) \
&cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) { + if ((SUCCESS != \
zend_hash_find(&list->cookies, (char *) name, name_len + 1, (void **) &cookie)) || \
(Z_TYPE_PP(cookie) != IS_STRING)) { return NULL;
}
return Z_STRVAL_PP(cookie);
@@ -75,7 +75,7 @@
PHP_HTTP_API const char *_http_cookie_list_get_extra(http_cookie_list *list, const \
char *name, size_t name_len TSRMLS_DC) {
zval **extra = NULL;
- if ((SUCCESS != zend_hash_find(&list->extras,name, name_len + 1, (void **) &extra)) \
|| (Z_TYPE_PP(extra) != IS_STRING)) { + if ((SUCCESS != zend_hash_find(&list->extras, \
(char *) name, name_len + 1, (void **) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) { \
return NULL; }
return Z_STRVAL_PP(extra);
@@ -86,7 +86,7 @@
zval *cookie_value;
MAKE_STD_ZVAL(cookie_value);
ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
- zend_hash_update(&list->cookies, name, name_len + 1, (void *) &cookie_value, \
sizeof(zval *), NULL); + zend_hash_update(&list->cookies, (char *) name, name_len + \
1, (void *) &cookie_value, sizeof(zval *), NULL); }
PHP_HTTP_API void _http_cookie_list_add_extra(http_cookie_list *list, const char \
*name, size_t name_len, const char *value, size_t value_len TSRMLS_DC) @@ -94,7 +94,7 \
@@ zval *cookie_value;
MAKE_STD_ZVAL(cookie_value);
ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
- zend_hash_update(&list->extras, name, name_len + 1, (void *) &cookie_value, \
sizeof(zval *), NULL); + zend_hash_update(&list->extras, (char *) name, name_len + 1, \
(void *) &cookie_value, sizeof(zval *), NULL); }
#define http_cookie_list_set_item_ex(l, i, il, v, vl, f, a) \
_http_cookie_list_set_item_ex((l), (i), (il), (v), (vl), (f), (a) TSRMLS_CC) @@ \
-219,7 +219,6 @@ case ';':
case '\0':
goto add;
- st = ST_ADD;
break;
default:
http://cvs.php.net/viewcvs.cgi/pecl/http/http_filter_api.c?r1=1.15&r2=1.16&diff_format=u
Index: pecl/http/http_filter_api.c
diff -u pecl/http/http_filter_api.c:1.15 pecl/http/http_filter_api.c:1.16
--- pecl/http/http_filter_api.c:1.15 Thu Jan 19 11:42:08 2006
+++ pecl/http/http_filter_api.c Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: http_filter_api.c,v 1.15 2006/01/19 11:42:08 mike Exp $ */
+/* $Id: http_filter_api.c,v 1.16 2006/02/27 14:35:04 mike Exp $ */
#define HTTP_WANT_ZLIB
#include "php_http.h"
@@ -74,7 +74,7 @@
php_stream_bucket_append(buckets_out, __buck TSRMLS_CC); \
}
-typedef struct {
+typedef struct _http_chunked_decode_filter_buffer_t {
phpstr buffer;
ulong hexlen;
} HTTP_FILTER_BUFFER(chunked_decode);
http://cvs.php.net/viewcvs.cgi/pecl/http/http_info_api.c?r1=1.13&r2=1.14&diff_format=u
Index: pecl/http/http_info_api.c
diff -u pecl/http/http_info_api.c:1.13 pecl/http/http_info_api.c:1.14
--- pecl/http/http_info_api.c:1.13 Thu Jan 19 11:42:08 2006
+++ pecl/http/http_info_api.c Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: http_info_api.c,v 1.13 2006/01/19 11:42:08 mike Exp $ */
+/* $Id: http_info_api.c,v 1.14 2006/02/27 14:35:04 mike Exp $ */
#include "php_http.h"
@@ -37,19 +37,17 @@
}
}
-PHP_HTTP_API void _http_info_dtor(http_info *info)
+PHP_HTTP_API void _http_info_dtor(http_info *i)
{
- http_info_t *i = (http_info_t *) info;
-
- switch (info->type)
+ switch (i->type)
{
case IS_HTTP_REQUEST:
- STR_SET(i->request.method, NULL);
- STR_SET(i->request.url, NULL);
+ STR_SET(HTTP_INFO(i).request.method, NULL);
+ STR_SET(HTTP_INFO(i).request.url, NULL);
break;
case IS_HTTP_RESPONSE:
- STR_SET(i->response.status, NULL);
+ STR_SET(HTTP_INFO(i).response.status, NULL);
break;
default:
http://cvs.php.net/viewcvs.cgi/pecl/http/http_response_object.c?r1=1.76&r2=1.77&diff_format=u
Index: pecl/http/http_response_object.c
diff -u pecl/http/http_response_object.c:1.76 pecl/http/http_response_object.c:1.77
--- pecl/http/http_response_object.c:1.76 Tue Feb 14 08:10:53 2006
+++ pecl/http/http_response_object.c Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: http_response_object.c,v 1.76 2006/02/14 08:10:53 mike Exp $ */
+/* $Id: http_response_object.c,v 1.77 2006/02/27 14:35:04 mike Exp $ */
#define HTTP_WANT_SAPI
#define HTTP_WANT_MAGIC
@@ -567,15 +567,12 @@
*/
PHP_METHOD(HttpResponse, guessContentType)
{
+#ifdef HTTP_HAVE_MAGIC
char *magic_file, *ct = NULL;
int magic_file_len;
- long magic_mode = 0;
+ long magic_mode = MAGIC_MIME;
RETVAL_FALSE;
-
-#ifdef HTTP_HAVE_MAGIC
- magic_mode = MAGIC_MIME;
-
SET_EH_THROW_HTTP();
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, \
&magic_file_len, &magic_mode)) { switch (Z_LVAL_P(GET_STATIC_PROP(mode))) {
@@ -608,6 +605,7 @@
SET_EH_NORMAL();
#else
http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not \
available"); + RETURN_FALSE;
#endif
}
/* }}} */
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_cache_api.h?r1=1.29&r2=1.30&diff_format=u
Index: pecl/http/php_http_cache_api.h
diff -u pecl/http/php_http_cache_api.h:1.29 pecl/http/php_http_cache_api.h:1.30
--- pecl/http/php_http_cache_api.h:1.29 Tue Feb 7 21:31:34 2006
+++ pecl/http/php_http_cache_api.h Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_cache_api.h,v 1.29 2006/02/07 21:31:34 mike Exp $ */
+/* $Id: php_http_cache_api.h,v 1.30 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_CACHE_API_H
#define PHP_HTTP_CACHE_API_H
@@ -116,7 +116,7 @@
if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) {
uint i, c = *((uint *) ctx);
for (i = 0; i < data_len; ++i) {
- c = CRC32(c, data_ptr[i]);
+ CRC32(c, data_ptr[i]);
}
*((uint *)ctx) = c;
} else if (mode && (!strcasecmp(mode, "sha1"))) {
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_cookie_api.h?r1=1.2&r2=1.3&diff_format=u
Index: pecl/http/php_http_cookie_api.h
diff -u pecl/http/php_http_cookie_api.h:1.2 pecl/http/php_http_cookie_api.h:1.3
--- pecl/http/php_http_cookie_api.h:1.2 Mon Feb 13 21:42:16 2006
+++ pecl/http/php_http_cookie_api.h Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_cookie_api.h,v 1.2 2006/02/13 21:42:16 mike Exp $ */
+/* $Id: php_http_cookie_api.h,v 1.3 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_COOKIE_API_H
#define PHP_HTTP_COOKIE_API_H
@@ -27,7 +27,7 @@
cookie params like those from rfc2109 and rfc2965 are just put into extras, if
one specifies them in allowed extras, else they're treated like cookies themself
*/
-typedef struct {
+typedef struct _http_cookie_list_t {
HashTable cookies;
HashTable extras;
long flags;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_deflatestream_object.h?r1=1.3&r2=1.4&diff_format=u
Index: pecl/http/php_http_deflatestream_object.h
diff -u pecl/http/php_http_deflatestream_object.h:1.3 \
pecl/http/php_http_deflatestream_object.h:1.4
--- pecl/http/php_http_deflatestream_object.h:1.3 Mon Jan 2 15:36:58 2006
+++ pecl/http/php_http_deflatestream_object.h Mon Feb 27 14:35:04 2006
@@ -10,13 +10,13 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_deflatestream_object.h,v 1.3 2006/01/02 15:36:58 mike Exp $ */
+/* $Id: php_http_deflatestream_object.h,v 1.4 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_DEFLATESTREAM_OBJECT_H
#define PHP_HTTP_DEFLATESTREAM_OBJECT_H
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_ZLIB)
-typedef struct {
+typedef struct _http_deflatestream_object_t {
zend_object zo;
http_encoding_stream *stream;
} http_deflatestream_object;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_encoding_api.h?r1=1.19&r2=1.20&diff_format=u
Index: pecl/http/php_http_encoding_api.h
diff -u pecl/http/php_http_encoding_api.h:1.19 pecl/http/php_http_encoding_api.h:1.20
--- pecl/http/php_http_encoding_api.h:1.19 Tue Jan 31 18:52:50 2006
+++ pecl/http/php_http_encoding_api.h Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_encoding_api.h,v 1.19 2006/01/31 18:52:50 mike Exp $ */
+/* $Id: php_http_encoding_api.h,v 1.20 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_ENCODING_API_H
#define PHP_HTTP_ENCODING_API_H
@@ -27,7 +27,7 @@
extern PHP_RINIT_FUNCTION(http_encoding);
extern PHP_RSHUTDOWN_FUNCTION(http_encoding);
-typedef enum {
+typedef enum _http_encoding_type_t {
HTTP_ENCODING_NONE,
HTTP_ENCODING_GZIP,
HTTP_ENCODING_DEFLATE,
@@ -64,7 +64,7 @@
#define HTTP_ENCODING_STREAM_PERSISTENT 0x01000000
-typedef struct {
+typedef struct _http_encoding_stream_t {
z_stream stream;
int flags;
void *storage;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_headers_api.h?r1=1.16&r2=1.17&diff_format=u
Index: pecl/http/php_http_headers_api.h
diff -u pecl/http/php_http_headers_api.h:1.16 pecl/http/php_http_headers_api.h:1.17
--- pecl/http/php_http_headers_api.h:1.16 Fri Jan 6 23:34:45 2006
+++ pecl/http/php_http_headers_api.h Mon Feb 27 14:35:04 2006
@@ -10,14 +10,14 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_headers_api.h,v 1.16 2006/01/06 23:34:45 mike Exp $ */
+/* $Id: php_http_headers_api.h,v 1.17 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_HEADERS_API_H
#define PHP_HTTP_HEADERS_API_H
#include "php_http_info_api.h"
-typedef enum {
+typedef enum http_range_status_t {
RANGE_OK,
RANGE_NO,
RANGE_ERR
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_inflatestream_object.h?r1=1.3&r2=1.4&diff_format=u
Index: pecl/http/php_http_inflatestream_object.h
diff -u pecl/http/php_http_inflatestream_object.h:1.3 \
pecl/http/php_http_inflatestream_object.h:1.4
--- pecl/http/php_http_inflatestream_object.h:1.3 Mon Jan 2 15:36:58 2006
+++ pecl/http/php_http_inflatestream_object.h Mon Feb 27 14:35:04 2006
@@ -10,13 +10,13 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_inflatestream_object.h,v 1.3 2006/01/02 15:36:58 mike Exp $ */
+/* $Id: php_http_inflatestream_object.h,v 1.4 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_INFLATESTREAM_OBJECT_H
#define PHP_HTTP_INFLATESTREAM_OBJECT_H
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_ZLIB)
-typedef struct {
+typedef struct _http_inflatestream_object_t {
zend_object zo;
http_encoding_stream *stream;
} http_inflatestream_object;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_info_api.h?r1=1.5&r2=1.6&diff_format=u
Index: pecl/http/php_http_info_api.h
diff -u pecl/http/php_http_info_api.h:1.5 pecl/http/php_http_info_api.h:1.6
--- pecl/http/php_http_info_api.h:1.5 Mon Jan 2 15:36:58 2006
+++ pecl/http/php_http_info_api.h Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_info_api.h,v 1.5 2006/01/02 15:36:58 mike Exp $ */
+/* $Id: php_http_info_api.h,v 1.6 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_INFO_API_H
#define PHP_HTTP_INFO_API_H
@@ -20,27 +20,27 @@
#define HTTP_INFO(ptr) (ptr)->http.info
-typedef struct {
+typedef struct _http_request_info_t {
char *method;
char *url;
} http_request_info;
-typedef struct {
+typedef struct _http_response_info_t {
int code;
char *status;
} http_response_info;
-typedef union {
+typedef union _http_info_union_t {
http_request_info request;
http_response_info response;
-} http_info_t;
+} http_info_union;
struct http_info {
- http_info_t info;
+ http_info_union info;
double version;
};
-typedef struct {
+typedef struct _http_info_t {
struct http_info http;
int type;
} http_info;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_message_api.h?r1=1.20&r2=1.21&diff_format=u
Index: pecl/http/php_http_message_api.h
diff -u pecl/http/php_http_message_api.h:1.20 pecl/http/php_http_message_api.h:1.21
--- pecl/http/php_http_message_api.h:1.20 Tue Feb 14 18:08:06 2006
+++ pecl/http/php_http_message_api.h Mon Feb 27 14:35:04 2006
@@ -10,22 +10,22 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_message_api.h,v 1.20 2006/02/14 18:08:06 mike Exp $ */
+/* $Id: php_http_message_api.h,v 1.21 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_MESSAGE_API_H
#define PHP_HTTP_MESSAGE_API_H
#include "php_http_info_api.h"
-typedef enum {
+typedef enum _http_message_type_t {
HTTP_MSG_NONE = 0,
HTTP_MSG_REQUEST = IS_HTTP_REQUEST,
HTTP_MSG_RESPONSE = IS_HTTP_RESPONSE,
} http_message_type;
-typedef struct _http_message http_message;
+typedef struct _http_message_t http_message;
-struct _http_message {
+struct _http_message_t {
phpstr body;
HashTable hdrs;
http_message_type type;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_message_object.h?r1=1.26&r2=1.27&diff_format=u
Index: pecl/http/php_http_message_object.h
diff -u pecl/http/php_http_message_object.h:1.26 \
pecl/http/php_http_message_object.h:1.27
--- pecl/http/php_http_message_object.h:1.26 Tue Feb 14 17:18:54 2006
+++ pecl/http/php_http_message_object.h Mon Feb 27 14:35:04 2006
@@ -10,13 +10,13 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_message_object.h,v 1.26 2006/02/14 17:18:54 mike Exp $ */
+/* $Id: php_http_message_object.h,v 1.27 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_MESSAGE_OBJECT_H
#define PHP_HTTP_MESSAGE_OBJECT_H
#ifdef ZEND_ENGINE_2
-typedef struct {
+typedef struct _http_message_object_t {
zend_object zo;
http_message *message;
zend_object_value parent;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_querystring_object.h?r1=1.5&r2=1.6&diff_format=u
Index: pecl/http/php_http_querystring_object.h
diff -u pecl/http/php_http_querystring_object.h:1.5 \
pecl/http/php_http_querystring_object.h:1.6
--- pecl/http/php_http_querystring_object.h:1.5 Sat Feb 18 19:11:33 2006
+++ pecl/http/php_http_querystring_object.h Mon Feb 27 14:35:04 2006
@@ -10,13 +10,13 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_querystring_object.h,v 1.5 2006/02/18 19:11:33 mike Exp $ */
+/* $Id: php_http_querystring_object.h,v 1.6 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_QUERYSTRING_OBJECT_H
#define PHP_HTTP_QUERYSTRING_OBJECT_H
#ifdef ZEND_ENGINE_2
-typedef struct {
+typedef struct _http_querystring_object_t {
zend_object zo;
} http_querystring_object;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_request_api.h?r1=1.38&r2=1.39&diff_format=u
Index: pecl/http/php_http_request_api.h
diff -u pecl/http/php_http_request_api.h:1.38 pecl/http/php_http_request_api.h:1.39
--- pecl/http/php_http_request_api.h:1.38 Sat Jan 7 18:46:38 2006
+++ pecl/http/php_http_request_api.h Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_request_api.h,v 1.38 2006/01/07 18:46:38 mike Exp $ */
+/* $Id: php_http_request_api.h,v 1.39 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_REQUEST_API_H
#define PHP_HTTP_REQUEST_API_H
@@ -23,7 +23,7 @@
extern PHP_MINIT_FUNCTION(http_request);
extern PHP_MSHUTDOWN_FUNCTION(http_request);
-typedef struct {
+typedef struct _http_request_t {
CURL *ch;
char *url;
http_request_method meth;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_request_body_api.h?r1=1.8&r2=1.9&diff_format=u
Index: pecl/http/php_http_request_body_api.h
diff -u pecl/http/php_http_request_body_api.h:1.8 \
pecl/http/php_http_request_body_api.h:1.9
--- pecl/http/php_http_request_body_api.h:1.8 Fri Feb 24 20:31:53 2006
+++ pecl/http/php_http_request_body_api.h Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_request_body_api.h,v 1.8 2006/02/24 20:31:53 mike Exp $ */
+/* $Id: php_http_request_body_api.h,v 1.9 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_REQUEST_BODY_API_H
#define PHP_HTTP_REQUEST_BODY_API_H
@@ -21,7 +21,7 @@
#define HTTP_REQUEST_BODY_CSTRING 1
#define HTTP_REQUEST_BODY_CURLPOST 2
#define HTTP_REQUEST_BODY_UPLOADFILE 3
-typedef struct {
+typedef struct _http_request_body_t {
uint type:3;
uint free:1;
uint priv:28;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_request_method_api.h?r1=1.9&r2=1.10&diff_format=u
Index: pecl/http/php_http_request_method_api.h
diff -u pecl/http/php_http_request_method_api.h:1.9 \
pecl/http/php_http_request_method_api.h:1.10
--- pecl/http/php_http_request_method_api.h:1.9 Mon Jan 2 15:36:58 2006
+++ pecl/http/php_http_request_method_api.h Mon Feb 27 14:35:04 2006
@@ -10,12 +10,14 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_request_method_api.h,v 1.9 2006/01/02 15:36:58 mike Exp $ */
+/* $Id: php_http_request_method_api.h,v 1.10 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_REQUEST_METHOD_API_H
#define PHP_HTTP_REQUEST_METHOD_API_H
-typedef enum {
+typedef enum _http_request_method_t {
+ /* force the enum to be signed */
+ HTTP_NEG_REQUEST_METHOD =-1,
HTTP_NO_REQUEST_METHOD = 0,
/* HTTP/1.1 */
HTTP_GET = 1,
@@ -54,7 +56,7 @@
#define HTTP_MIN_REQUEST_METHOD (HTTP_NO_REQUEST_METHOD + 1)
#define HTTP_CUSTOM_REQUEST_METHOD_START HTTP_MAX_REQUEST_METHOD
-typedef struct {
+typedef struct _http_request_method_entry_t {
char *name;
char *cnst;
} http_request_method_entry;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_request_object.h?r1=1.34&r2=1.35&diff_format=u
Index: pecl/http/php_http_request_object.h
diff -u pecl/http/php_http_request_object.h:1.34 \
pecl/http/php_http_request_object.h:1.35
--- pecl/http/php_http_request_object.h:1.34 Fri Feb 24 20:31:53 2006
+++ pecl/http/php_http_request_object.h Mon Feb 27 14:35:04 2006
@@ -10,7 +10,7 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_request_object.h,v 1.34 2006/02/24 20:31:53 mike Exp $ */
+/* $Id: php_http_request_object.h,v 1.35 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_REQUEST_OBJECT_H
#define PHP_HTTP_REQUEST_OBJECT_H
@@ -19,7 +19,7 @@
#include "php_http_request_pool_api.h"
-typedef struct {
+typedef struct _http_request_object_t {
zend_object zo;
http_request *request;
http_request_pool *pool;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_request_pool_api.h?r1=1.11&r2=1.12&diff_format=u
Index: pecl/http/php_http_request_pool_api.h
diff -u pecl/http/php_http_request_pool_api.h:1.11 \
pecl/http/php_http_request_pool_api.h:1.12
--- pecl/http/php_http_request_pool_api.h:1.11 Mon Jan 2 15:36:58 2006
+++ pecl/http/php_http_request_pool_api.h Mon Feb 27 14:35:04 2006
@@ -10,13 +10,13 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_request_pool_api.h,v 1.11 2006/01/02 15:36:58 mike Exp $ */
+/* $Id: php_http_request_pool_api.h,v 1.12 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_REQUEST_POOL_API_H
#define PHP_HTTP_REQUEST_POOL_API_H
#ifdef HTTP_HAVE_CURL
-typedef struct {
+typedef struct _http_request_pool_t {
CURLM *ch;
zend_llist finished;
zend_llist handles;
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_requestpool_object.h?r1=1.14&r2=1.15&diff_format=u
Index: pecl/http/php_http_requestpool_object.h
diff -u pecl/http/php_http_requestpool_object.h:1.14 \
pecl/http/php_http_requestpool_object.h:1.15
--- pecl/http/php_http_requestpool_object.h:1.14 Mon Jan 2 15:36:58 2006
+++ pecl/http/php_http_requestpool_object.h Mon Feb 27 14:35:04 2006
@@ -10,14 +10,14 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_requestpool_object.h,v 1.14 2006/01/02 15:36:58 mike Exp $ */
+/* $Id: php_http_requestpool_object.h,v 1.15 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_REQUESTPOOL_OBJECT_H
#define PHP_HTTP_REQUESTPOOL_OBJECT_H
#ifdef HTTP_HAVE_CURL
#ifdef ZEND_ENGINE_2
-typedef struct {
+typedef struct _http_requestpool_object_t {
zend_object zo;
http_request_pool pool;
struct {
http://cvs.php.net/viewcvs.cgi/pecl/http/php_http_send_api.h?r1=1.14&r2=1.15&diff_format=u
Index: pecl/http/php_http_send_api.h
diff -u pecl/http/php_http_send_api.h:1.14 pecl/http/php_http_send_api.h:1.15
--- pecl/http/php_http_send_api.h:1.14 Mon Feb 20 16:06:21 2006
+++ pecl/http/php_http_send_api.h Mon Feb 27 14:35:04 2006
@@ -10,12 +10,12 @@
+--------------------------------------------------------------------+
*/
-/* $Id: php_http_send_api.h,v 1.14 2006/02/20 16:06:21 mike Exp $ */
+/* $Id: php_http_send_api.h,v 1.15 2006/02/27 14:35:04 mike Exp $ */
#ifndef PHP_HTTP_SEND_API_H
#define PHP_HTTP_SEND_API_H
-typedef enum {
+typedef enum _http_send_mode_t {
SEND_DATA,
SEND_RSRC
} http_send_mode;
http://cvs.php.net/viewcvs.cgi/pecl/http/phpstr/phpstr.h?r1=1.22&r2=1.23&diff_format=u
Index: pecl/http/phpstr/phpstr.h
diff -u pecl/http/phpstr/phpstr.h:1.22 pecl/http/phpstr/phpstr.h:1.23
--- pecl/http/phpstr/phpstr.h:1.22 Thu Feb 16 17:49:53 2006
+++ pecl/http/phpstr/phpstr.h Mon Feb 27 14:35:04 2006
@@ -1,5 +1,5 @@
-/* $Id: phpstr.h,v 1.22 2006/02/16 17:49:53 mike Exp $ */
+/* $Id: phpstr.h,v 1.23 2006/02/27 14:35:04 mike Exp $ */
#ifndef _PHPSTR_H_
#define _PHPSTR_H_
@@ -68,7 +68,7 @@
RETVAL_STRINGL((STR)->data, (STR)->used, (dup)); \
FREE_PHPSTR((free), (STR));
-typedef struct {
+typedef struct _phpstr_t {
size_t size;
char *data;
size_t used;
@@ -76,7 +76,7 @@
int pmem;
} phpstr;
-typedef enum {
+typedef enum _phpstr_free_t {
PHPSTR_FREE_NOT = 0,
PHPSTR_FREE_PTR, /* pefree() */
PHPSTR_FREE_VAL, /* phpstr_dtor() */
http://cvs.php.net/viewcvs.cgi/pecl/http/tests/request_cookies.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/http/tests/request_cookies.phpt
diff -u pecl/http/tests/request_cookies.phpt:1.1 \
pecl/http/tests/request_cookies.phpt:1.2
--- pecl/http/tests/request_cookies.phpt:1.1 Fri Feb 10 16:58:51 2006
+++ pecl/http/tests/request_cookies.phpt Mon Feb 27 14:35:04 2006
@@ -23,6 +23,11 @@
?>
--EXPECTF--
%sTEST
+GET /.print_request.php HTTP/1.1
+User-Agent: %s
+Host: dev.iworks.at
+Accept: */*
+Cookie: name=val%3Due
HTTP/1.1 200 OK
%s
@@ -35,7 +40,7 @@
User-Agent: %s
Host: dev.iworks.at
Accept: */*
-Cookie: name=val%3Due
+Cookie: name=val=ue;
HTTP/1.1 200 OK
%s
@@ -44,9 +49,4 @@
[name] => val=ue
)
-GET /.print_request.php HTTP/1.1
-User-Agent: %s
-Host: dev.iworks.at
-Accept: */*
-Cookie: name=val=ue;
Done
--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic