build and file maintenance
authorMichael Wallner <mike@php.net>
Thu, 28 Jul 2011 15:31:52 +0000 (15:31 +0000)
committerMichael Wallner <mike@php.net>
Thu, 28 Jul 2011 15:31:52 +0000 (15:31 +0000)
68 files changed:
config9.m4
php_http.c
php_http.h
php_http_buffer.c
php_http_buffer.h
php_http_cookie.c
php_http_cookie.h
php_http_curl.c
php_http_curl.h
php_http_encoding.c
php_http_encoding.h
php_http_env.c
php_http_env.h
php_http_env_response.c
php_http_env_response.h
php_http_etag.c
php_http_etag.h
php_http_exception.c
php_http_exception.h
php_http_filter.c
php_http_filter.h
php_http_header_parser.c
php_http_header_parser.h
php_http_headers.c
php_http_headers.h
php_http_info.c
php_http_info.h
php_http_message.c
php_http_message.h
php_http_message_body.c
php_http_message_body.h
php_http_message_parser.c
php_http_message_parser.h
php_http_misc.c
php_http_misc.h
php_http_negotiate.c
php_http_negotiate.h
php_http_neon.c
php_http_neon.h
php_http_object.c
php_http_object.h
php_http_params.c
php_http_params.h
php_http_persistent_handle.c
php_http_persistent_handle.h
php_http_property_proxy.c
php_http_property_proxy.h
php_http_querystring.c
php_http_querystring.h
php_http_request.c
php_http_request.h
php_http_request_datashare.c
php_http_request_datashare.h
php_http_request_factory.c
php_http_request_factory.h
php_http_request_info.c
php_http_request_method.c
php_http_request_method.h
php_http_request_pool.c
php_http_request_pool.h
php_http_resource_factory.c
php_http_resource_factory.h
php_http_strlist.c
php_http_strlist.h
php_http_url.c
php_http_url.h
php_http_version.c
php_http_version.h

index f9f3a47..bae4032 100644 (file)
@@ -137,222 +137,240 @@ dnl ----
 dnl NEON
 dnl ----
 
-       AC_MSG_CHECKING([for neon/ne_session.h])
-       NEON_DIR=
-       for i in "$PHP_HTTP_LIBNEON_DIR" /usr/local /usr /opt; do
-               if test -f "$i/include/neon/ne_session.h"; then
-                       NEON_DIR=$i
-                       break
-               fi
-       done
-
-       if test "x$NEON_DIR" = "x"; then
-               AC_MSG_RESULT([not found])
+       if test "$PHP_HTTP_LIBNEON_DIR" = "no"; then
+               AC_DEFINE([PHP_HTTP_HAVE_NEON], [0], [ ])
        else
-               AC_MSG_RESULT([found in $NEON_DIR])
-
-               AC_MSG_CHECKING([for neon-config])
-               NEON_CONFIG=
-               for i in "$NEON_DIR/bin/neon-config" "$NEON_DIR/neon-config" `which neon-config`; do
-                       if test -x "$i"; then
-                               NEON_CONFIG=$i
+               AC_MSG_CHECKING([for neon/ne_session.h])
+               NEON_DIR=
+               for i in "$PHP_HTTP_LIBNEON_DIR" /usr/local /usr /opt; do
+                       if test -f "$i/include/neon/ne_session.h"; then
+                               NEON_DIR=$i
                                break
                        fi
                done
-               if test "x$NEON_CONFIG" = "x"; then
+
+               if test "x$NEON_DIR" = "x"; then
                        AC_MSG_RESULT([not found])
-                       AC_MSG_ERROR([could not find neon-config])
+                       AC_DEFINE([PHP_HTTP_HAVE_NEON], [0], [ ])
                else
-                       AC_MSG_RESULT([found: $NEON_CONFIG])
-               fi
+                       AC_MSG_RESULT([found in $NEON_DIR])
 
-               AC_MSG_CHECKING([for libneon version])
-               PHP_HTTP_NEON_VERSION=`$NEON_CONFIG --version | $SED -re 's/^neon ([[^ :]]+).*/\1/g'`
-               if test "x$PHP_HTTP_NEON_VERSION" = "x"; then
-                       AC_MSG_RESULT([unknown])
-                       PHP_HTTP_NEON_VERSION="unknown"
-               else
-                       AC_MSG_RESULT([$PHP_HTTP_NEON_VERSION])
+                       AC_MSG_CHECKING([for neon-config])
+                       NEON_CONFIG=
+                       for i in "$NEON_DIR/bin/neon-config" "$NEON_DIR/neon-config" `which neon-config`; do
+                               if test -x "$i"; then
+                                       NEON_CONFIG=$i
+                                       break
+                               fi
+                       done
+                       if test "x$NEON_CONFIG" = "x"; then
+                               AC_MSG_RESULT([not found])
+                               AC_DEFINE([PHP_HTTP_HAVE_NEON], [0], [ ])
+                       else
+                               AC_MSG_RESULT([found: $NEON_CONFIG])
+
+                               AC_MSG_CHECKING([for libneon version])
+                               PHP_HTTP_NEON_VERSION=`$NEON_CONFIG --version | $SED -re 's/^neon ([[^ :]]+).*/\1/g'`
+                               if test "x$PHP_HTTP_NEON_VERSION" = "x"; then
+                                       AC_MSG_RESULT([unknown])
+                                       PHP_HTTP_NEON_VERSION="unknown"
+                               else
+                                       AC_MSG_RESULT([$PHP_HTTP_NEON_VERSION])
+                               fi
+                               AC_DEFINE_UNQUOTED([PHP_HTTP_NEON_VERSION], ["$PHP_HTTP_NEON_VERSION"], [neon-config --version])
+                               PHP_ADD_INCLUDE($NEON_DIR/include)
+                               PHP_ADD_LIBRARY_WITH_PATH(neon, $NEON_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+                               AC_DEFINE([PHP_HTTP_HAVE_NEON], [1], [Have libneon support])
+                               HTTP_HAVE_A_REQUEST_LIB=true
+                       fi
                fi
-               AC_DEFINE_UNQUOTED([PHP_HTTP_NEON_VERSION], ["$PHP_HTTP_NEON_VERSION"], [neon-config --version])
-               PHP_ADD_INCLUDE($NEON_DIR/include)
-               PHP_ADD_LIBRARY_WITH_PATH(neon, $NEON_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-               AC_DEFINE([PHP_HTTP_HAVE_NEON], [1], [Have libneon support])
-               HTTP_HAVE_A_REQUEST_LIB=true
        fi
-       
+
 dnl ----
 dnl SERF
 dnl ----
 
-       AC_MSG_CHECKING([for serf-?/serf.h])
-       SERF_DIR=
-       for i in "$PHP_HTTP_LIBSERF_DIR" /usr/local /usr /opt; do
-               if test -f "$i/include/serf-0/serf.h"; then
-                       SERF_DIR=$i
-                       SERF_VER=0
-                       break
-               elif test -f "$i/include/serf-1/serf.h"; then
-                       SERF_DIR=$i
-                       SERF_VER=1
-               fi
-       done
-
-       if test "x$SERF_DIR" = "x"; then
-               AC_MSG_RESULT([not found])
+       if test "$PHP_HTTP_LIBSERF_DIR" = "no"; then
+               AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
        else
-               AC_MSG_RESULT([found in $SERF_DIR])
+               AC_MSG_CHECKING([for serf-?/serf.h])
+               SERF_DIR=
+               for i in "$PHP_HTTP_LIBSERF_DIR" /usr/local /usr /opt; do
+                       if test -f "$i/include/serf-0/serf.h"; then
+                               SERF_DIR=$i
+                               SERF_VER=0
+                               break
+                       elif test -f "$i/include/serf-1/serf.h"; then
+                               SERF_DIR=$i
+                               SERF_VER=1
+                       fi
+               done
 
-               PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERV_VER)
-               PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-               AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [HAve libserf support])
-               HTTP_HAVE_A_REQUEST_LIB=true
+               if test "x$SERF_DIR" = "x"; then
+                       AC_MSG_RESULT([not found])
+                       AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
+               else
+                       AC_MSG_RESULT([found in $SERF_DIR])
+
+                       PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERV_VER)
+                       PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+                       AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [Have libserf support])
+                       HTTP_HAVE_A_REQUEST_LIB=true
+               fi
        fi
        
 dnl ----
 dnl CURL
 dnl ----
-       AC_MSG_CHECKING([for curl/curl.h])
-       CURL_DIR=
-       for i in "$PHP_HTTP_LIBCURL_DIR" /usr/local /usr /opt; do
-               if test -f "$i/include/curl/curl.h"; then
-                       CURL_DIR=$i
-                       break
-               fi
-       done
-       if test "x$CURL_DIR" = "x"; then
-               AC_MSG_RESULT([not found])
+
+       if test "$PHP_HTTP_LIBCURL_DIR" = "no"; then
+               AC_DEFINE([PHP_HTTP_HAVE_CURL], [0], [ ])
        else
-               AC_MSG_RESULT([found in $CURL_DIR])
-               
-               AC_MSG_CHECKING([for curl-config])
-               CURL_CONFIG=
-               for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
-                       if test -x "$i"; then
-                               CURL_CONFIG=$i
+               AC_MSG_CHECKING([for curl/curl.h])
+               CURL_DIR=
+               for i in "$PHP_HTTP_LIBCURL_DIR" /usr/local /usr /opt; do
+                       if test -f "$i/include/curl/curl.h"; then
+                               CURL_DIR=$i
                                break
                        fi
                done
-               if test "x$CURL_CONFIG" = "x"; then
+               if test "x$CURL_DIR" = "x"; then
                        AC_MSG_RESULT([not found])
-                       AC_MSG_ERROR([could not find curl-config])
                else
-                       AC_MSG_RESULT([found: $CURL_CONFIG])
-               fi
+                       AC_MSG_RESULT([found in $CURL_DIR])
                
-               dnl Debian stable has currently 7.18.2
-               AC_MSG_CHECKING([for curl version >= 7.18.2])
-               CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
-               AC_MSG_RESULT([$CURL_VERSION])
-               if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
-                       AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
-               fi
+                       AC_MSG_CHECKING([for curl-config])
+                       CURL_CONFIG=
+                       for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
+                               if test -x "$i"; then
+                                       CURL_CONFIG=$i
+                                       break
+                               fi
+                       done
+                       if test "x$CURL_CONFIG" = "x"; then
+                               AC_MSG_RESULT([not found])
+                               AC_MSG_ERROR([could not find curl-config])
+                       else
+                               AC_MSG_RESULT([found: $CURL_CONFIG])
+                       fi
+               
+                       dnl Debian stable has currently 7.18.2
+                       AC_MSG_CHECKING([for curl version >= 7.18.2])
+                       CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
+                       AC_MSG_RESULT([$CURL_VERSION])
+                       if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
+                               AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
+                       fi
                
-               dnl
-               dnl compile tests
-               dnl
+                       dnl
+                       dnl compile tests
+                       dnl
                
-               save_INCLUDES="$INCLUDES"
-               INCLUDES=
-               save_LIBS="$LIBS"
-               LIBS=
-               save_CFLAGS="$CFLAGS"
-               CFLAGS=`$CURL_CONFIG --cflags`
-               save_LDFLAGS="$LDFLAGS"
-               LDFLAGS=`$CURL_CONFIG --libs`
-               LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+                       save_INCLUDES="$INCLUDES"
+                       INCLUDES=
+                       save_LIBS="$LIBS"
+                       LIBS=
+                       save_CFLAGS="$CFLAGS"
+                       CFLAGS=`$CURL_CONFIG --cflags`
+                       save_LDFLAGS="$LDFLAGS"
+                       LDFLAGS=`$CURL_CONFIG --libs`
+                       LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
                
-               AC_MSG_CHECKING([for SSL support in libcurl])
-               CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
-               if test "$CURL_SSL" = "SSL"; then
-                       AC_MSG_RESULT([yes])
-                       AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ])
+                       AC_MSG_CHECKING([for SSL support in libcurl])
+                       CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
+                       if test "$CURL_SSL" = "SSL"; then
+                               AC_MSG_RESULT([yes])
+                               AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ])
                        
-                       AC_MSG_CHECKING([for openssl support in libcurl])
-                       AC_TRY_RUN([
-                               #include <curl/curl.h>
-                               int main(int argc, char *argv[]) {
-                                       curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-                                       if (data && data->ssl_version && *data->ssl_version) {
-                                               const char *ptr = data->ssl_version;
-                                               while(*ptr == ' ') ++ptr;
-                                               return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
+                               AC_MSG_CHECKING([for openssl support in libcurl])
+                               AC_TRY_RUN([
+                                       #include <curl/curl.h>
+                                       int main(int argc, char *argv[]) {
+                                               curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+                                               if (data && data->ssl_version && *data->ssl_version) {
+                                                       const char *ptr = data->ssl_version;
+                                                       while(*ptr == ' ') ++ptr;
+                                                       return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
+                                               }
+                                               return 1;
                                        }
-                                       return 1;
-                               }
-                       ], [
-                               AC_MSG_RESULT([yes])
-                               AC_CHECK_HEADER([openssl/crypto.h], [
-                                       AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
+                               ], [
+                                       AC_MSG_RESULT([yes])
+                                       AC_CHECK_HEADER([openssl/crypto.h], [
+                                               AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
+                                       ])
+                               ], [
+                                       AC_MSG_RESULT([no])
+                               ], [
+                                       AC_MSG_RESULT([no])
                                ])
-                       ], [
-                               AC_MSG_RESULT([no])
-                       ], [
-                               AC_MSG_RESULT([no])
-                       ])
                        
-                       AC_MSG_CHECKING([for gnutls support in libcurl])
-                       AC_TRY_RUN([
-                               #include <curl/curl.h>
-                               int main(int argc, char *argv[]) {
-                                       curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-                                       if (data && data->ssl_version && *data->ssl_version) {
-                                               const char *ptr = data->ssl_version;
-                                               while(*ptr == ' ') ++ptr;
-                                               return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
+                               AC_MSG_CHECKING([for gnutls support in libcurl])
+                               AC_TRY_RUN([
+                                       #include <curl/curl.h>
+                                       int main(int argc, char *argv[]) {
+                                               curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+                                               if (data && data->ssl_version && *data->ssl_version) {
+                                                       const char *ptr = data->ssl_version;
+                                                       while(*ptr == ' ') ++ptr;
+                                                       return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
+                                               }
+                                               return 1;
                                        }
-                                       return 1;
-                               }
-                       ], [
-                               AC_MSG_RESULT([yes])
-                               AC_CHECK_HEADER([gcrypt.h], [
-                                       AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
+                               ], [
+                                       AC_MSG_RESULT([yes])
+                                       AC_CHECK_HEADER([gcrypt.h], [
+                                               AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
+                                       ])
+                               ], [
+                                       AC_MSG_RESULT([no])
+                               ], [
+                                       AC_MSG_RESULT([no])
                                ])
-                       ], [
-                               AC_MSG_RESULT([no])
-                       ], [
+                       else
                                AC_MSG_RESULT([no])
-                       ])
-               else
-                       AC_MSG_RESULT([no])
-               fi
+                       fi
                
-               INCLUDES="$save_INCLUDES"
-               LIBS="$save_LIBS"
-               CFLAGS="$save_CFLAGS"
-               LDFLAGS="$save_LDFLAGS"
+                       INCLUDES="$save_INCLUDES"
+                       LIBS="$save_LIBS"
+                       CFLAGS="$save_CFLAGS"
+                       LDFLAGS="$save_LDFLAGS"
                
-               dnl end compile tests
+                       dnl end compile tests
                
-               AC_MSG_CHECKING([for bundled SSL CA info])
-               CURL_CAINFO=
-               for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
-                       if test -f "$i"; then
-                               CURL_CAINFO="$i"
-                               break
+                       AC_MSG_CHECKING([for bundled SSL CA info])
+                       CURL_CAINFO=
+                       for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
+                               if test -f "$i"; then
+                                       CURL_CAINFO="$i"
+                                       break
+                               fi
+                       done
+                       if test "x$CURL_CAINFO" = "x"; then
+                               AC_MSG_RESULT([not found])
+                       else
+                               AC_MSG_RESULT([$CURL_CAINFO])
+                               AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAINFO], ["$CURL_CAINFO"], [path to bundled SSL CA info])
                        fi
-               done
-               if test "x$CURL_CAINFO" = "x"; then
-                       AC_MSG_RESULT([not found])
-               else
-                       AC_MSG_RESULT([$CURL_CAINFO])
-                       AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAINFO], ["$CURL_CAINFO"], [path to bundled SSL CA info])
-               fi
                
-               PHP_ADD_INCLUDE($CURL_DIR/include)
-               PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-               PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
-               AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
-               HTTP_HAVE_A_REQUEST_LIB=true
+                       PHP_ADD_INCLUDE($CURL_DIR/include)
+                       PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+                       PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
+                       AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
+                       HTTP_HAVE_A_REQUEST_LIB=true
+               fi
        fi
 
-       dnl ----
-       dnl EVENT
-       dnl ----
-       
-       if test "$PHP_HTTP_LIBEVENT_DIR" != "no"; then
+dnl ----
+dnl EVENT
+dnl ----
+
+       if test "$PHP_HTTP_LIBEVENT_DIR" = "no"; then
+               AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
+       else
                HTTP_HAVE_PHP_EXT([event], [
                        AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support])
+                       AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
                ], [
                        AC_MSG_CHECKING([for event.h])
                        EVENT_DIR=
@@ -365,6 +383,7 @@ dnl ----
                        if test "x$EVENT_DIR" = "x"; then
                                AC_MSG_RESULT([not found])
                                AC_MSG_WARN([continuing without libevent support])
+                               AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
                        else
                                AC_MSG_RESULT([found in $EVENT_DIR])
                                
@@ -388,8 +407,8 @@ dnl ----
        fi
 
 PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
-[  --without-http-shared-deps     HTTP: do not depend on extensions like hash
-                                        and iconv (when they're built shared)], $PHP_HTTP, $PHP_HTTP)
+[  --without-http-shared-deps   HTTP: do not depend on extensions like hash
+                                     and iconv (when they're built shared)], $PHP_HTTP, $PHP_HTTP)
 dnl ----
 dnl HASH
 dnl ----
@@ -502,12 +521,7 @@ dnl ----
                php_http_url.h \
                php_http_version.h \
        "
-       ifdef([PHP_INSTALL_HEADERS], [
-               PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
-       ], [
-               PHP_SUBST([PHP_HTTP_HEADERS])
-               PHP_ADD_MAKEFILE_FRAGMENT
-       ])
+       PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi
index fb49548..b71e6c2 100644 (file)
@@ -6,24 +6,25 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http.c 300300 2010-06-09 07:29:35Z mike $ */
-
 #include "php_http.h"
 
 #include <zlib.h>
-#ifdef PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_CURL
 #      include <curl/curl.h>
-#      ifdef PHP_HTTP_HAVE_EVENT
+#      if PHP_HTTP_HAVE_EVENT
 #              include <event.h>
 #      endif
 #endif
-#ifdef PHP_HTTP_HAVE_NEON
+#if PHP_HTTP_HAVE_NEON
 #      include "neon/ne_utils.h"
 #endif
+#if PHP_HTTP_HAVE_SERF
+#      include "serf.h"
+#endif
 
 #include <main/php_ini.h>
 #include <ext/standard/info.h>
@@ -47,13 +48,13 @@ PHP_MINFO_FUNCTION(http);
 
 static zend_module_dep http_module_deps[] = {
        ZEND_MOD_REQUIRED("spl")
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
        ZEND_MOD_REQUIRED("hash")
 #endif
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
        ZEND_MOD_REQUIRED("iconv")
 #endif
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
        ZEND_MOD_CONFLICTS("event")
 #endif
        {NULL, NULL, NULL, 0}
@@ -147,8 +148,12 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_querystring)
        || SUCCESS != PHP_MINIT_CALL(http_request_factory)
        || SUCCESS != PHP_MINIT_CALL(http_request)
+#if PHP_HTTP_HAVE_CURL
        || SUCCESS != PHP_MINIT_CALL(http_curl)
+#endif
+#if PHP_HTTP_HAVE_NEON
        || SUCCESS != PHP_MINIT_CALL(http_neon)
+#endif
        || SUCCESS != PHP_MINIT_CALL(http_request_datashare)
        || SUCCESS != PHP_MINIT_CALL(http_request_method)
        || SUCCESS != PHP_MINIT_CALL(http_request_pool)
@@ -170,8 +175,12 @@ PHP_MSHUTDOWN_FUNCTION(http)
        
        if (0
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
+#if PHP_HTTP_HAVE_CURL
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
+#endif
+#if PHP_HTTP_HAVE_NEON
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_neon)
+#endif
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
@@ -187,7 +196,9 @@ PHP_RINIT_FUNCTION(http)
        if (0
        || SUCCESS != PHP_RINIT_CALL(http_env)
        || SUCCESS != PHP_RINIT_CALL(http_request_datashare)
+#if PHP_HTTP_HAVE_CURL
        || SUCCESS != PHP_RINIT_CALL(http_curl)
+#endif
        ) {
                return FAILURE;
        }
@@ -217,7 +228,7 @@ PHP_MINFO_FUNCTION(http)
        php_info_print_table_start();
        php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
        php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion());
-#ifdef PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_CURL
        {
                curl_version_info_data *cv = curl_version_info(CURLVERSION_NOW);
                php_info_print_table_row(3, "libcurl", LIBCURL_VERSION, cv->version);
@@ -225,7 +236,7 @@ PHP_MINFO_FUNCTION(http)
 #else
        php_info_print_table_row(3, "libcurl", "disabled", "disabled");
 #endif
-#ifdef PHP_HTTP_HAVE_NEON
+#if PHP_HTTP_HAVE_NEON
        {
                char ne_v[16] = {0};
                sscanf(ne_version_string(), "neon %15[^ :]", &ne_v[0]);
@@ -235,7 +246,7 @@ PHP_MINFO_FUNCTION(http)
        php_info_print_table_row(3, "libneon", "disabled", "disabled");
 #endif
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
        php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());
 #else
        php_info_print_table_row(3, "libevent", "disabled", "disabled");
index 4d2b929..0cd759c 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http.h 300300 2010-06-09 07:29:35Z mike $ */
-
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
@@ -118,8 +116,8 @@ ZEND_BEGIN_MODULE_GLOBALS(php_http)
        struct php_http_env_globals env;
        struct php_http_persistent_handle_globals persistent_handle;
        struct php_http_request_datashare_globals request_datashare;
-#ifdef PHP_HTTP_HAVE_EVENT
-       struct php_http_request_pool_globals request_pool;
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+       struct php_http_curl_globals curl;
 #endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
index 41fd48a..7736259 100644 (file)
@@ -1,5 +1,14 @@
-
-/* $Id: php_http_buffer_t.c 211942 2006-04-24 17:17:09Z mike $ */
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php.h"
 #include "php_http_buffer.h"
index ee78c41..384120e 100644 (file)
@@ -1,8 +1,17 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
-/* $Id: php_http_buffer_t.h 229282 2007-02-07 15:31:50Z mike $ */
-
-#ifndef _PHP_HTTP_BUFFER_H
-#define _PHP_HTTP_BUFFER_H
+#ifndef PHP_HTTP_BUFFER_H
+#define PHP_HTTP_BUFFER_H
 
 #ifndef PHP_HTTP_BUFFER_DEFAULT_SIZE
 #      define PHP_HTTP_BUFFER_DEFAULT_SIZE 256
index 146b086..1bfa734 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_cookie_api.c 298662 2010-04-27 13:42:32Z mike $ */
-
 #include "php_http.h"
 
 #include <ext/date/php_date.h>
index 5d2d3a3..c263b0c 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_cookie_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_COOKIE_H
 #define PHP_HTTP_COOKIE_H
 
index 377a0ea..0c30f87 100644 (file)
@@ -1,12 +1,26 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
+
+#if PHP_HTTP_HAVE_CURL
+
 #include "php_http_request.h"
 #include "php_http_request_pool.h"
 
 #include <curl/curl.h>
 #define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
 #      include <event.h>
 #endif
 
@@ -47,7 +61,7 @@ typedef struct php_http_curl_request_pool {
 
        int unfinished;  /* int because of curl_multi_perform() */
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
        struct event *timeout;
        unsigned useevents:1;
        unsigned runsocket:1;
@@ -395,7 +409,7 @@ static void php_http_curl_request_pool_responsehandler(php_http_request_pool_t *
 }
 
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
 
 typedef struct php_http_request_pool_event {
        struct event evnt;
@@ -1340,7 +1354,7 @@ static void php_http_curl_request_pool_dtor(php_http_request_pool_t *h)
        php_http_curl_request_pool_t *curl = h->ctx;
        TSRMLS_FETCH_FROM_CTX(h->ts);
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
        if (curl->timeout) {
                efree(curl->timeout);
                curl->timeout = NULL;
@@ -1403,7 +1417,7 @@ static STATUS php_http_curl_request_pool_wait(php_http_request_pool_t *h, struct
        struct timeval timeout;
        php_http_curl_request_pool_t *curl = h->ctx;
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
        if (curl->useevents) {
                TSRMLS_FETCH_FROM_CTX(h->ts);
 
@@ -1444,10 +1458,10 @@ static STATUS php_http_curl_request_pool_wait(php_http_request_pool_t *h, struct
 static int php_http_curl_request_pool_once(php_http_request_pool_t *h)
 {
        php_http_curl_request_pool_t *curl = h->ctx;
-       TSRMLS_FETCH_FROM_CTX(h->ts);
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
        if (curl->useevents) {
+               TSRMLS_FETCH_FROM_CTX(h->ts);
                php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "not implemented");
                return FAILURE;
        }
@@ -1460,7 +1474,7 @@ static int php_http_curl_request_pool_once(php_http_request_pool_t *h)
        return curl->unfinished;
 
 }
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
 static void dolog(int i, const char *m) {
        fprintf(stderr, "%d: %s\n", i, m);
 }
@@ -1469,7 +1483,7 @@ static STATUS php_http_curl_request_pool_exec(php_http_request_pool_t *h)
 {
        TSRMLS_FETCH_FROM_CTX(h->ts);
 
-#ifdef PHP_HTTP_HAVE_EVENT
+#if PHP_HTTP_HAVE_EVENT
        php_http_curl_request_pool_t *curl = h->ctx;
 
        if (curl->useevents) {
@@ -2140,11 +2154,23 @@ PHP_MSHUTDOWN_FUNCTION(http_curl)
 
 PHP_RINIT_FUNCTION(http_curl)
 {
-#ifdef PHP_HTTP_HAVE_EVENT
-       if (!PHP_HTTP_G->request_pool.event_base && !(PHP_HTTP_G->request_pool.event_base = event_init())) {
+#if PHP_HTTP_HAVE_EVENT
+       if (!PHP_HTTP_G->curl.event_base && !(PHP_HTTP_G->curl.event_base = event_init())) {
                return FAILURE;
        }
 #endif
 
        return SUCCESS;
 }
+
+#endif /* PHP_HTTP_HAVE_CURL */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 6e9cc16..bd1c61a 100644 (file)
@@ -1,6 +1,20 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_CURL_H
 #define PHP_HTTP_CURL_H
 
+#if PHP_HTTP_HAVE_CURL
+
 PHP_HTTP_API php_http_request_ops_t *php_http_curl_get_request_ops(void);
 PHP_HTTP_API php_http_request_pool_ops_t *php_http_curl_get_request_pool_ops(void);
 PHP_HTTP_API php_http_request_datashare_ops_t *php_http_curl_get_request_datashare_ops(void);
@@ -9,8 +23,8 @@ extern PHP_MINIT_FUNCTION(http_curl);
 extern PHP_MSHUTDOWN_FUNCTION(http_curl);
 extern PHP_RINIT_FUNCTION(http_curl);
 
-#ifdef PHP_HTTP_HAVE_EVENT
-struct php_http_request_pool_globals {
+#if PHP_HTTP_HAVE_EVENT
+struct php_http_curl_globals {
        void *event_base;
 };
 #endif
@@ -22,4 +36,15 @@ extern zend_function_entry php_http_curl_method_entry[];
 
 PHP_METHOD(HttpCURL, __construct);
 
-#endif
+#endif /* PHP_HTTP_HAVE_CURL */
+#endif /* PHP_HTTP_CURL_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index e40de8a..48eb1c3 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_encoding_api.c 298592 2010-04-26 11:47:29Z mike $ */
-
 #include "php_http.h"
 
 #include <zlib.h>
index 23a3302..603880a 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_encoding_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_ENCODING_H
 #define PHP_HTTP_ENCODING_H
 
index 8f4036a..8cdbb73 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id $ */
-
 #include "php_http.h"
 
 #include <main/SAPI.h>
index 5fb5e5b..0fab82e 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifndef PHP_HTTP_ENV_H
 #define PHP_HTTP_ENV_H
 
index a374b42..cc739df 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id $ */
-
 #include "php_http.h"
 
 #include <main/SAPI.h>
index c6d5f05..d15b2bc 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_ENV_RESPONSE_H
 #define PHP_HTTP_ENV_RESPONSE_H
 
@@ -58,3 +70,13 @@ PHP_METHOD(HttpEnvResponse, send);
 PHP_MINIT_FUNCTION(http_env_response);
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 87164fe..543ce5f 100644 (file)
@@ -1,7 +1,18 @@
-#include "php_http.h"
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
+#include "php_http.h"
 
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
 #      include "php_hash.h"
 #endif
 
@@ -14,7 +25,7 @@ PHP_HTTP_API php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC)
        void *ctx;
        php_http_etag_t *e;
 
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
        const php_hash_ops *eho = NULL;
 
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -46,7 +57,7 @@ PHP_HTTP_API char *php_http_etag_finish(php_http_etag_t *e)
        unsigned char digest[128] = {0};
        char *etag = NULL;
 
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
        const php_hash_ops *eho = NULL;
 
        if (e->mode && (eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
@@ -73,7 +84,7 @@ PHP_HTTP_API char *php_http_etag_finish(php_http_etag_t *e)
 
 PHP_HTTP_API size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t data_len)
 {
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
        const php_hash_ops *eho = NULL;
 
        if (e->mode && (eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
@@ -95,3 +106,13 @@ PHP_HTTP_API size_t php_http_etag_update(php_http_etag_t *e, const char *data_pt
        return data_len;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 1ef7b23..899ec1c 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_ETAG_H
 #define PHP_HTTP_ETAG_H
 
@@ -31,3 +43,13 @@ static inline char *php_http_etag_digest(const unsigned char *digest, int len)
 }
 
 #endif /* PHP_HTTP_ETAG_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 8b5800e..698e047 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_exception_object.c 292841 2009-12-31 08:48:57Z mike $ */
-
 #include "php_http.h"
 
 #include <Zend/zend_exceptions.h>
index c461b19..ccc3aaa 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_exception_object.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_EXCEPTION_H
 #define PHP_HTTP_EXCEPTION_H
 
index 9dd0827..cdbc408 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_filter_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
 #include "php_http.h"
 
 PHP_MINIT_FUNCTION(http_filter)
index c8cb37d..4ba7ad3 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_filter_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_FILTER_H
 #define PHP_HTTP_FILTER_H
 
index c0b4515..d0b6c52 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
 
@@ -197,3 +208,13 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
 
        return php_http_header_parser_state_is(parser);
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 0d52930..171ed0b 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_HEADER_PARSER_H
 #define PHP_HTTP_HEADER_PARSER_H
 
@@ -39,3 +51,13 @@ PHP_HTTP_API void php_http_header_parser_free(php_http_header_parser_t **parser)
 PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg);
 
 #endif /* PHP_HTTP_HEADER_PARSER_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 0c4cbfa..24a4854 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_headers_api.c 300300 2010-06-09 07:29:35Z mike $ */
-
 #include "php_http.h"
 
 PHP_HTTP_API STATUS php_http_headers_parse(const char *header, size_t length, HashTable *headers, php_http_info_callback_t callback_func, void **callback_data TSRMLS_DC)
index 8cc0b8a..315a6db 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_headers_api.h 300300 2010-06-09 07:29:35Z mike $ */
-
 #ifndef PHP_HTTP_HEADERS_H
 #define PHP_HTTP_HEADERS_H
 
index 534eb2c..80d4ad8 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_info_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
 #include "php_http.h"
 
 PHP_HTTP_API void php_http_info_default_callback(void **nothing, HashTable **headers, php_http_info_t *info TSRMLS_DC)
index 2e47d19..ce65fd0 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_info_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_INFO_H
 #define PHP_HTTP_INFO_H
 
index 20ed46f..a99a0bb 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_message_api.c 298689 2010-04-28 06:50:06Z mike $ */
-
 #include "php_http.h"
 
 #include <main/SAPI.h>
index 65509e7..1890e57 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_message.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_MESSAGE_H
 #define PHP_HTTP_MESSAGE_H
 
index 5e47a6a..a52e826 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_message_body.c 292841 2009-12-31 08:48:57Z mike $ */
-
 #include "php_http.h"
 
 #include <libgen.h>
index e0ff8d9..74936c0 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_message_body_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_MESSAGE_BODY_H
 #define PHP_HTTP_MESSAGE_BODY_H
 
index fce24ed..3eb8571 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #include "php_http.h"
 
 typedef struct php_http_message_parser_state_spec {
@@ -401,3 +413,13 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 
        return php_http_message_parser_state_is(parser);
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index dcde640..31c3004 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #ifndef PHP_HTTP_MESSAGE_PARSER_H
 #define PHP_HTTP_MESSAGE_PARSER_H
@@ -44,3 +55,13 @@ PHP_HTTP_API void php_http_message_parser_free(php_http_message_parser_t **parse
 PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, php_http_message_t **message);
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 416e95d..db588ea 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id $ */
-
 #include "php_http.h"
 
 #include <ext/standard/php_lcg.h>
index a07f32f..bcf8d37 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_api.h 298891 2010-05-03 08:26:38Z mike $ */
-
 #ifndef PHP_HTTP_MISC_H
 #define PHP_HTTP_MISC_H
 
index 7fb7c56..cab0dd1 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_headers_api.h 300300 2010-06-09 07:29:35Z mike $ */
-
 #include "php_http.h"
 
 #include <ext/standard/php_string.h>
index d8814fa..cfcfdb0 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_headers_api.h 300300 2010-06-09 07:29:35Z mike $ */
-
 #ifndef PHP_HTTP_NEGOTIATE_H
 #define PHP_HTTP_NEGOTIATE_H
 
index a153f86..97ebc62 100644 (file)
@@ -1,5 +1,19 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
+
+#if PHP_HTTP_HAVE_NEON
+
 #include "php_http_request.h"
 
 #include <ext/date/php_date.h>
@@ -894,3 +908,15 @@ PHP_MSHUTDOWN_FUNCTION(http_neon)
        ne_sock_exit();
        return SUCCESS;
 }
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index dd4ff98..512dabe 100644 (file)
@@ -1,6 +1,20 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_NEON_H
 #define PHP_HTTP_NEON_H
 
+#if PHP_HTTP_HAVE_NEON
+
 php_http_request_ops_t *php_http_neon_get_request_ops(void);
 
 PHP_MINIT_FUNCTION(http_neon);
@@ -13,4 +27,15 @@ extern zend_function_entry php_http_neon_method_entry[];
 
 PHP_METHOD(HttpNEON, __construct);
 
+#endif /* PHP_HTTP_HAVE_NEON */
 #endif /* PHP_HTTP_NEON_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 13252e6..215ae8c 100644 (file)
@@ -6,13 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_api.c 300299 2010-06-09 06:23:16Z mike $ */
-
-
 #include "php_http.h"
 
 STATUS php_http_new(zend_object_value *ov, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC)
index c4ede0e..0d0ca92 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_api.c 300299 2010-06-09 06:23:16Z mike $ */
-
 #ifndef PHP_HTTP_OBJECT_H
 #define PHP_HTTP_OBJECT_H
 
index e4d4a6f..4e34ee3 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_api.c 300299 2010-06-09 06:23:16Z mike $ */
-
 #include "php_http.h"
 
 PHP_HTTP_API void php_http_params_parse_default_func(void *arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC)
index c570017..3aa446f 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_api.h 298891 2010-05-03 08:26:38Z mike $ */
-
 #ifndef PHP_HTTP_PARAMS_H
 #define PHP_HTTP_PARAMS_H
 
index c174a04..06a5024 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_persistent_handle_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
 #include "php_http.h"
 
 #ifndef PHP_HTTP_DEBUG_PHANDLES
index 07aa796..19b84b7 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_persistent_handle_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_PERSISTENT_HANDLE_H
 #define PHP_HTTP_PERSISTENT_HANDLE_H
 
index 35e725a..908ae9f 100644 (file)
@@ -1,7 +1,17 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
 
-
 php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_t *proxy, zval *object, zval *member TSRMLS_DC)
 {
        if (!proxy) {
@@ -188,3 +198,13 @@ PHP_MINIT_FUNCTION(http_property_proxy)
        return SUCCESS;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index bc63aaf..043d3ed 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #ifndef PHP_HTTP_PROPERTY_PROXY_H
 #define PHP_HTTP_PROPERTY_PROXY_H
@@ -29,3 +40,13 @@ PHP_METHOD(HttpPropertyProxy, __construct);
 PHP_MINIT_FUNCTION(http_property_proxy);
 
 #endif /* PHP_HTTP_PROPERTY_PROXY_H_ */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index d77bbda..364d2ee 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #include "php_http.h"
 
 #include <main/php_variables.h>
index ae1d072..1c2dbeb 100644 (file)
@@ -6,24 +6,18 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_querystring_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_QUERYSTRING_H
 #define PHP_HTTP_QUERYSTRING_H
 
-/* API */
-
 #ifdef PHP_HTTP_HAVE_ICONV
 PHP_HTTP_API STATUS php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe TSRMLS_DC);
 #endif /* PHP_HTTP_HAVE_ICONV */
 PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval *qstring TSRMLS_DC);
 
-/* PHP */
-
 typedef struct php_http_querystring_object {
        zend_object zo;
 } php_http_querystring_object_t;
index 7320856..9d4819d 100644 (file)
@@ -6,19 +6,16 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_request_api.c 298591 2010-04-26 11:46:55Z mike $ */
-
 #include "php_http.h"
 
 #include <ext/spl/spl_observer.h>
 #include <ext/spl/spl_iterators.h>
 #include <Zend/zend_interfaces.h>
 
-
 PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, php_http_request_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC)
 {
        php_http_request_t *free_h = NULL;
index 96baa36..5dc0750 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_request_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_REQUEST_H
 #define PHP_HTTP_REQUEST_H
 
index d6cbaa7..182ff1a 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
 
@@ -391,3 +402,13 @@ PHP_RSHUTDOWN_FUNCTION(http_request_datashare)
        return SUCCESS;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 3b71962..7a30b66 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_REQUEST_DATASHARE_H
 #define PHP_HTTP_REQUEST_DATASHARE_H
 
@@ -86,3 +98,13 @@ PHP_METHOD(HttpRequestDataShare, detach);
 PHP_METHOD(HttpRequestDataShare, reset);
 
 #endif /* PHP_HTTP_REQUEST_DATASHARE_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index f0e6680..f13318e 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
 
@@ -407,3 +418,13 @@ PHP_MSHUTDOWN_FUNCTION(http_request_factory)
        return SUCCESS;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 881025a..04db43b 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_REQUEST_FACTORY_H
 #define PHP_HTTP_REQUEST_FACTORY_H
 
@@ -30,3 +42,13 @@ extern PHP_MINIT_FUNCTION(http_request_factory);
 extern PHP_MSHUTDOWN_FUNCTION(http_request_factory);
 
 #endif /* PHP_HTTP_REQUEST_FACTORY_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 10d9440..ecfe8cd 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_request_info.c 293136 2010-01-05 08:48:52Z mike $ */
-
 #include "php_http.h"
 
 PHP_HTTP_API void php_http_request_info(php_http_request_t *request, HashTable *info)
index 43157c6..b4b3567 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_request_method_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
 #include "php_http.h"
 
 #include <Zend/zend_interfaces.h>
index bb2efc7..dcfd9b8 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_request_method_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_REQUEST_METHOD_H
 #define PHP_HTTP_REQUEST_METHOD_H
 
index e06bcb0..9ee6f76 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
 
@@ -564,3 +575,13 @@ PHP_MINIT_FUNCTION(http_request_pool)
        return SUCCESS;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 221292d..d2b6eb4 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #ifndef PHP_HTTP_REQUESTPOOL_H
 #define PHP_HTTP_REQUESTPOOL_H
@@ -104,3 +115,13 @@ PHP_METHOD(HttpRequestPool, enableEvents);
 PHP_MINIT_FUNCTION(http_request_pool);
 
 #endif /* PHP_HTTP_REQUESTPOOL_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index c3ff6f5..390d882 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id:$ */
-
 #include "php_http.h"
 #include "php_http_resource_factory.h"
 
index 1a0a8ec..df49fe7 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifndef PHP_HTTP_RESOURCE_FACTORY_H
 #define PHP_HTTP_RESOURCE_FACTORY_H
 
index 53ccac9..ee46786 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #include "php_http.h"
 
@@ -85,3 +96,13 @@ PHP_HTTP_API const char *php_http_strlist_find(const char list[], unsigned facto
 
     return p;
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 4bddbb2..35bdd9f 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_STRLIST_H
 #define PHP_HTTP_STRLIST_H
 
@@ -25,3 +37,13 @@ PHP_HTTP_API void php_http_strlist_iterator_dtor(php_http_strlist_iterator_t *it
 PHP_HTTP_API void php_http_strlist_iterator_free(php_http_strlist_iterator_t **iter);
 
 #endif /* PHP_HTTP_STRLIST_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 5825023..8170bc3 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_url_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
 #include "php_http.h"
 
 #include <main/SAPI.h>
index 23f529d..02535d8 100644 (file)
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_url_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_URL_H
 #define PHP_HTTP_URL_H
 
index 8c1637c..4561b8f 100644 (file)
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
 #include "php_http.h"
 
 PHP_HTTP_API php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor TSRMLS_DC)
@@ -57,3 +69,13 @@ PHP_HTTP_API void php_http_version_free(php_http_version_t **v)
                *v = NULL;
        }
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+
index 6f02ad7..875614a 100644 (file)
@@ -1,3 +1,14 @@
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
 
 #ifndef PHP_HTTP_VERSION_H
 #define        PHP_HTTP_VERSION_H
@@ -16,3 +27,13 @@ PHP_HTTP_API void php_http_version_free(php_http_version_t **v);
 
 #endif /* PHP_HTTP_VERSION_H */
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+