cvs: pecl /http KnownIssues.txt config.m4 http_util_object.c php_http_util_object.h

mike            Sun Jul 24 14:16:12 2005 EDT

  Modified files:              
    /pecl/http  KnownIssues.txt config.m4 http_util_object.c 
                php_http_util_object.h 
  Log:
  - no need to mark HttpUtil as final
  - Reflection awareness of HttpUtil
  - fix config.m4
  
  
  
http://cvs.php.net/diff.php/pecl/http/KnownIssues.txt?r1=1.4&r2=1.5&ty=u
Index: pecl/http/KnownIssues.txt
diff -u pecl/http/KnownIssues.txt:1.4 pecl/http/KnownIssues.txt:1.5
--- pecl/http/KnownIssues.txt:1.4       Sun Jul 24 06:30:45 2005
+++ pecl/http/KnownIssues.txt   Sun Jul 24 14:16:11 2005
@@ -1,6 +1,9 @@
 Known Issues
 ============
-$Id: KnownIssues.txt,v 1.4 2005/07/24 10:30:45 mike Exp $
+$Id: KnownIssues.txt,v 1.5 2005/07/24 18:16:11 mike Exp $
 
 Issues I don't know how to solve yet are as follows:
 
+- INI entry allowed_methods is not working properly
+- Reflection on static class members does not work
+
http://cvs.php.net/diff.php/pecl/http/config.m4?r1=1.21&r2=1.22&ty=u
Index: pecl/http/config.m4
diff -u pecl/http/config.m4:1.21 pecl/http/config.m4:1.22
--- pecl/http/config.m4:1.21    Sun Jul 24 06:30:45 2005
+++ pecl/http/config.m4 Sun Jul 24 14:16:11 2005
@@ -1,5 +1,5 @@
 dnl config.m4 for pecl/http
-dnl $Id: config.m4,v 1.21 2005/07/24 10:30:45 mike Exp $
+dnl $Id: config.m4,v 1.22 2005/07/24 18:16:11 mike Exp $
 
 PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
 [  --enable-http           Enable extended HTTP support])
@@ -79,10 +79,12 @@
        PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])
        PHP_SUBST([HTTP_SHARED_LIBADD])
        PHP_ADD_MAKEFILE_FRAGMENT
-       if ! test -z "$HTTP_ODD_WARNINGS"; then
-               CFLAGS=" -g -O2 -W -Wchar-subscripts -Wformat=2 -Wno-format-y2k 
-Wimplicit -Wmissing-braces -Wunused-variable -Wbad-function-cast 
-Wpointer-arith -Wsign-compare -Winline"
-               PHP_SUBST([CFLAGS])
-       fi
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
-fi
 
+dnl ---
+dnl odd warnings
+dnl ---
+dnl            CFLAGS=" -g -O2 -W -Wchar-subscripts -Wformat=2 -Wno-format-y2k 
-Wimplicit -Wmissing-braces -Wunused-variable -Wbad-function-cast 
-Wpointer-arith -Wsign-compare -Winline"
+dnl            PHP_SUBST([CFLAGS])
+
+fi
http://cvs.php.net/diff.php/pecl/http/http_util_object.c?r1=1.7&r2=1.8&ty=u
Index: pecl/http/http_util_object.c
diff -u pecl/http/http_util_object.c:1.7 pecl/http/http_util_object.c:1.8
--- pecl/http/http_util_object.c:1.7    Sun Jul 24 04:51:39 2005
+++ pecl/http/http_util_object.c        Sun Jul 24 14:16:11 2005
@@ -13,7 +13,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: http_util_object.c,v 1.7 2005/07/24 08:51:39 mike Exp $ */
+/* $Id: http_util_object.c,v 1.8 2005/07/24 18:16:11 mike Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -27,25 +27,91 @@
 #include "php_http_std_defs.h"
 #include "php_http_util_object.h"
 
+#define HTTP_BEGIN_ARGS(method, req_args)              
HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method, ret_ref)               
HTTP_EMPTY_ARGS_EX(HttpUtil, method, ret_ref)
+
+#define HTTP_UTIL_ALIAS(method, func)                  
HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpUtil, method))
+
+HTTP_BEGIN_ARGS(date, 0)
+       HTTP_ARG_VAL(timestamp, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(absoluteUri, 1)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(proto, 0)
+       HTTP_ARG_VAL(host, 0)
+       HTTP_ARG_VAL(port, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(negotiateLanguage, 1)
+       HTTP_ARG_VAL(supported, 0)
+       HTTP_ARG_VAL(default, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(negotiateCharset, 1)
+       HTTP_ARG_VAL(supported, 0)
+       HTTP_ARG_VAL(default, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchModified, 1)
+       HTTP_ARG_VAL(last_modified, 0)
+       HTTP_ARG_VAL(for_range, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchEtag, 1)
+       HTTP_ARG_VAL(plain_etag, 0)
+       HTTP_ARG_VAL(for_range, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(matchRequestHeader, 2)
+       HTTP_ARG_VAL(header_name, 0)
+       HTTP_ARG_VAL(header_value, 0)
+       HTTP_ARG_VAL(case_sensitive, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(chunkedDecode, 1)
+       HTTP_ARG_VAL(encoded_string, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(splitResponse, 1)
+       HTTP_ARG_VAL(response_string, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(parseHeaders, 1)
+       HTTP_ARG_VAL(headers_string, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(authBasic, 2)
+       HTTP_ARG_VAL(username, 0)
+       HTTP_ARG_VAL(password, 0)
+       HTTP_ARG_VAL(realm, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(authBasicCallback, 1)
+       HTTP_ARG_VAL(callback, 0)
+       HTTP_ARG_VAL(realm, 0)
+HTTP_END_ARGS;
+
 zend_class_entry *http_util_object_ce;
 zend_function_entry http_util_object_fe[] = {
-       HTTP_STATIC_ME_ALIAS(date, http_date, NULL)
-       HTTP_STATIC_ME_ALIAS(absoluteURI, http_absolute_uri, NULL)
-       HTTP_STATIC_ME_ALIAS(negotiateLanguage, http_negotiate_language, NULL)
-       HTTP_STATIC_ME_ALIAS(negotiateCharset, http_negotiate_charset, NULL)
-       HTTP_STATIC_ME_ALIAS(matchModified, http_match_modified, NULL)
-       HTTP_STATIC_ME_ALIAS(matchEtag, http_match_etag, NULL)
-       HTTP_STATIC_ME_ALIAS(chunkedDecode, http_chunked_decode, NULL)
-       HTTP_STATIC_ME_ALIAS(splitResponse, http_split_response, NULL)
-       HTTP_STATIC_ME_ALIAS(parseHeaders, http_parse_headers, NULL)
-       HTTP_STATIC_ME_ALIAS(authBasic, http_auth_basic, NULL)
-       HTTP_STATIC_ME_ALIAS(authBasicCallback, http_auth_basic_cb, NULL)
+       HTTP_UTIL_ALIAS(date, http_date)
+       HTTP_UTIL_ALIAS(absoluteUri, http_absolute_uri)
+       HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
+       HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
+       HTTP_UTIL_ALIAS(matchModified, http_match_modified)
+       HTTP_UTIL_ALIAS(matchEtag, http_match_etag)
+       HTTP_UTIL_ALIAS(matchRequestHeader, http_match_request_header)
+       HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
+       HTTP_UTIL_ALIAS(splitResponse, http_split_response)
+       HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
+       HTTP_UTIL_ALIAS(authBasic, http_auth_basic)
+       HTTP_UTIL_ALIAS(authBasicCallback, http_auth_basic_cb)
        {NULL, NULL, NULL}
 };
 
 void _http_util_object_init(INIT_FUNC_ARGS)
 {
-       HTTP_REGISTER_CLASS(HttpUtil, http_util_object, NULL, 
ZEND_ACC_FINAL_CLASS);
+       HTTP_REGISTER_CLASS(HttpUtil, http_util_object, NULL, 0);
 }
 
 #endif /* ZEND_ENGINE_2 */
http://cvs.php.net/diff.php/pecl/http/php_http_util_object.h?r1=1.5&r2=1.6&ty=u
Index: pecl/http/php_http_util_object.h
diff -u pecl/http/php_http_util_object.h:1.5 
pecl/http/php_http_util_object.h:1.6
--- pecl/http/php_http_util_object.h:1.5        Sun Jul 24 04:51:39 2005
+++ pecl/http/php_http_util_object.h    Sun Jul 24 14:16:11 2005
@@ -13,7 +13,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_http_util_object.h,v 1.5 2005/07/24 08:51:39 mike Exp $ */
+/* $Id: php_http_util_object.h,v 1.6 2005/07/24 18:16:11 mike Exp $ */
 
 #ifndef PHP_HTTP_UTIL_OBJECT_H
 #define PHP_HTTP_UTIL_OBJECT_H
@@ -26,7 +26,7 @@
 extern void _http_util_object_init(INIT_FUNC_ARGS);
 
 PHP_METHOD(HttpUtil, date);
-PHP_METHOD(HttpUtil, absoluteURI);
+PHP_METHOD(HttpUtil, absoluteUri);
 PHP_METHOD(HttpUtil, negotiateLanguage);
 PHP_METHOD(HttpUtil, negotiateCharset);
 PHP_METHOD(HttpUtil, matchModified);