From bdd6edb59194cda9e5fcb393c48ab4230fceb32a Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Mon, 28 Sep 2015 16:08:14 +0200 Subject: [PATCH] attempt to implement some personal standards --- .editorconfig | 20 ++ .gitignore | 1 + AUTHORS | 1 + KnownIssues.txt => BUGS | 0 CONTRIBUTING.md | 39 +++ Exceptions.txt | 4 - LICENSE | 2 +- Makefile.frag | 16 ++ README.md | 131 ++------- ThanksTo.txt => THANKS | 9 +- config.w32 | 262 +++++++++--------- config9.m4 | 167 +++++------ package.xml | 164 ++++++----- .../bench_select_vs_event.php | 0 .../check_package-xml.php | 35 ++- gen_curlinfo.php => scripts/gen_curlinfo.php | 0 reflection2php.php => scripts/gen_stubs.php | 0 .../gen_travis_yml.php | 0 gen_utf8.php => scripts/gen_utf8.php | 0 php_http.c => src/php_http.c | 0 php_http_api.h => src/php_http_api.h | 0 php_http_buffer.c => src/php_http_buffer.c | 0 php_http_buffer.h => src/php_http_buffer.h | 0 php_http_client.c => src/php_http_client.c | 0 php_http_client.h => src/php_http_client.h | 0 .../php_http_client_curl.c | 0 .../php_http_client_curl.h | 0 .../php_http_client_request.c | 0 .../php_http_client_request.h | 0 .../php_http_client_response.c | 0 .../php_http_client_response.h | 0 php_http_cookie.c => src/php_http_cookie.c | 0 php_http_cookie.h => src/php_http_cookie.h | 0 php_http_curl.c => src/php_http_curl.c | 0 php_http_curl.h => src/php_http_curl.h | 0 .../php_http_encoding.c | 0 .../php_http_encoding.h | 0 php_http_env.c => src/php_http_env.c | 0 php_http_env.h => src/php_http_env.h | 0 .../php_http_env_request.c | 0 .../php_http_env_request.h | 0 .../php_http_env_response.c | 0 .../php_http_env_response.h | 0 php_http_etag.c => src/php_http_etag.c | 0 php_http_etag.h => src/php_http_etag.h | 0 .../php_http_exception.c | 0 .../php_http_exception.h | 0 php_http_filter.c => src/php_http_filter.c | 0 php_http_filter.h => src/php_http_filter.h | 0 php_http_header.c => src/php_http_header.c | 0 php_http_header.h => src/php_http_header.h | 0 .../php_http_header_parser.c | 0 .../php_http_header_parser.h | 0 php_http_info.c => src/php_http_info.c | 0 php_http_info.h => src/php_http_info.h | 0 php_http_message.c => src/php_http_message.c | 0 php_http_message.h => src/php_http_message.h | 0 .../php_http_message_body.c | 0 .../php_http_message_body.h | 0 .../php_http_message_parser.c | 0 .../php_http_message_parser.h | 0 php_http_misc.c => src/php_http_misc.c | 0 php_http_misc.h => src/php_http_misc.h | 0 .../php_http_negotiate.c | 0 .../php_http_negotiate.h | 0 php_http_object.c => src/php_http_object.c | 0 php_http_object.h => src/php_http_object.h | 0 php_http_options.c => src/php_http_options.c | 0 php_http_options.h => src/php_http_options.h | 0 php_http_params.c => src/php_http_params.c | 0 php_http_params.h => src/php_http_params.h | 0 .../php_http_querystring.c | 0 .../php_http_querystring.h | 0 .../php_http_response_codes.h | 0 php_http_url.c => src/php_http_url.c | 0 php_http_url.h => src/php_http_url.h | 0 php_http_utf8.h => src/php_http_utf8.h | 0 php_http_version.c => src/php_http_version.c | 0 php_http_version.h => src/php_http_version.h | 0 79 files changed, 427 insertions(+), 424 deletions(-) create mode 100644 .editorconfig create mode 100644 AUTHORS rename KnownIssues.txt => BUGS (100%) create mode 100644 CONTRIBUTING.md delete mode 100644 Exceptions.txt create mode 100644 Makefile.frag rename ThanksTo.txt => THANKS (72%) rename bench_select_vs_event.php => scripts/bench_select_vs_event.php (100%) rename check_package-xml.php => scripts/check_package-xml.php (67%) rename gen_curlinfo.php => scripts/gen_curlinfo.php (100%) rename reflection2php.php => scripts/gen_stubs.php (100%) rename gen_travis_yml.php => scripts/gen_travis_yml.php (100%) rename gen_utf8.php => scripts/gen_utf8.php (100%) rename php_http.c => src/php_http.c (100%) rename php_http_api.h => src/php_http_api.h (100%) rename php_http_buffer.c => src/php_http_buffer.c (100%) rename php_http_buffer.h => src/php_http_buffer.h (100%) rename php_http_client.c => src/php_http_client.c (100%) rename php_http_client.h => src/php_http_client.h (100%) rename php_http_client_curl.c => src/php_http_client_curl.c (100%) rename php_http_client_curl.h => src/php_http_client_curl.h (100%) rename php_http_client_request.c => src/php_http_client_request.c (100%) rename php_http_client_request.h => src/php_http_client_request.h (100%) rename php_http_client_response.c => src/php_http_client_response.c (100%) rename php_http_client_response.h => src/php_http_client_response.h (100%) rename php_http_cookie.c => src/php_http_cookie.c (100%) rename php_http_cookie.h => src/php_http_cookie.h (100%) rename php_http_curl.c => src/php_http_curl.c (100%) rename php_http_curl.h => src/php_http_curl.h (100%) rename php_http_encoding.c => src/php_http_encoding.c (100%) rename php_http_encoding.h => src/php_http_encoding.h (100%) rename php_http_env.c => src/php_http_env.c (100%) rename php_http_env.h => src/php_http_env.h (100%) rename php_http_env_request.c => src/php_http_env_request.c (100%) rename php_http_env_request.h => src/php_http_env_request.h (100%) rename php_http_env_response.c => src/php_http_env_response.c (100%) rename php_http_env_response.h => src/php_http_env_response.h (100%) rename php_http_etag.c => src/php_http_etag.c (100%) rename php_http_etag.h => src/php_http_etag.h (100%) rename php_http_exception.c => src/php_http_exception.c (100%) rename php_http_exception.h => src/php_http_exception.h (100%) rename php_http_filter.c => src/php_http_filter.c (100%) rename php_http_filter.h => src/php_http_filter.h (100%) rename php_http_header.c => src/php_http_header.c (100%) rename php_http_header.h => src/php_http_header.h (100%) rename php_http_header_parser.c => src/php_http_header_parser.c (100%) rename php_http_header_parser.h => src/php_http_header_parser.h (100%) rename php_http_info.c => src/php_http_info.c (100%) rename php_http_info.h => src/php_http_info.h (100%) rename php_http_message.c => src/php_http_message.c (100%) rename php_http_message.h => src/php_http_message.h (100%) rename php_http_message_body.c => src/php_http_message_body.c (100%) rename php_http_message_body.h => src/php_http_message_body.h (100%) rename php_http_message_parser.c => src/php_http_message_parser.c (100%) rename php_http_message_parser.h => src/php_http_message_parser.h (100%) rename php_http_misc.c => src/php_http_misc.c (100%) rename php_http_misc.h => src/php_http_misc.h (100%) rename php_http_negotiate.c => src/php_http_negotiate.c (100%) rename php_http_negotiate.h => src/php_http_negotiate.h (100%) rename php_http_object.c => src/php_http_object.c (100%) rename php_http_object.h => src/php_http_object.h (100%) rename php_http_options.c => src/php_http_options.c (100%) rename php_http_options.h => src/php_http_options.h (100%) rename php_http_params.c => src/php_http_params.c (100%) rename php_http_params.h => src/php_http_params.h (100%) rename php_http_querystring.c => src/php_http_querystring.c (100%) rename php_http_querystring.h => src/php_http_querystring.h (100%) rename php_http_response_codes.h => src/php_http_response_codes.h (100%) rename php_http_url.c => src/php_http_url.c (100%) rename php_http_url.h => src/php_http_url.h (100%) rename php_http_utf8.h => src/php_http_utf8.h (100%) rename php_http_version.c => src/php_http_version.c (100%) rename php_http_version.h => src/php_http_version.h (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e0c3b0e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +; see http://editorconfig.org +root = true + +[*] +end_of_line = lf +insert_final_newline = true +indent_style = tab +charset = utf-8 +trim_trailing_whitespace = true + +[package.xml] +indent_style = space +indent_size = 1 + +[*.md] +trim_trailing_whitespace = false + +[*.json] +indent_style = space +indent_size = 4 diff --git a/.gitignore b/.gitignore index c78e2b8..fc8d761 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ tests/*.sh lcov_data *~ *.phar +vendor/ diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..67bbd91 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Michael Wallner diff --git a/KnownIssues.txt b/BUGS similarity index 100% rename from KnownIssues.txt rename to BUGS diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..968bd44 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,39 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of +fostering an open and welcoming community, we pledge to respect all people who +contribute through reporting issues, posting feature requests, updating +documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free +experience for everyone, regardless of level of experience, gender, gender +identity and expression, sexual orientation, disability, personal appearance, +body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic + addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct. By adopting this Code of Conduct, project +maintainers commit themselves to fairly and consistently applying these +principles to every aspect of managing this project. Project maintainers who do +not follow or enforce the Code of Conduct may be permanently removed from the +project team. + +This code of conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the +[Contributor Covenant](http://contributor-covenant.org), version 1.2.0, +available at http://contributor-covenant.org/version/1/2/0/. diff --git a/Exceptions.txt b/Exceptions.txt deleted file mode 100644 index f666ee9..0000000 --- a/Exceptions.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Throw Exceptions: - -* on setters, that return self -* on getters, that return objects diff --git a/LICENSE b/LICENSE index 786ba27..c7d1587 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2014, Michael Wallner . +Copyright (c) 2004-2015, Michael Wallner . All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile.frag b/Makefile.frag new file mode 100644 index 0000000..3ef9ecb --- /dev/null +++ b/Makefile.frag @@ -0,0 +1,16 @@ +# provide headers in builddir, so they do not end up in /usr/include/ext/http/src + +PHP_HTTP_HEADERS := $(addprefix $(PHP_HTTP_BUILDDIR)/,$(PHP_HTTP_HEADERS)) + +$(PHP_HTTP_BUILDDIR)/%.h: $(PHP_HTTP_SRCDIR)/src/%.h + @cat >$@ <$< + +all: http-build-headers +clean: http-clean-headers + +.PHONY: http-build-headers +http-build-headers: $(PHP_HTTP_HEADERS) + +.PHONY: http-clean-headers +http-clean-headers: + -rm $(PHP_HTTP_HEADERS) diff --git a/README.md b/README.md index c0ee4d1..19738da 100644 --- a/README.md +++ b/README.md @@ -1,121 +1,48 @@ -# pecl/http v2 +# ext-http -[![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=R_2_5)](https://travis-ci.org/m6w6/ext-http) +[![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=master)](https://travis-ci.org/m6w6/ext-http) -## About: +Extended HTTP support. Again. -Extended HTTP support. Again. +## Documentation -* Introduces the http namespace. -* PHP stream based message bodies. -* Encapsulated env request/response. -* Modular client support. +See the [online markdown reference](https://mdref.m6w6.name/http). -## Installation: +Known issues are listed in [BUGS](./BUGS) and future ideas can be found in [TODO](./TODO). -This extension is hosted at [PECL](http://pecl.php.net) and can be installed with [PEAR](http://pear.php.net)'s pecl command: +## Installing - # pecl install pecl_http +### PECL -## Dependencies: + pecl install pecl_http -pecl/http depends on a number of system libraries and PHP extensions for special features. +### PHARext -#### Required system libraries: +Watch out for [PECL replicates](https://replicator.pharext.org?pecl_http) +and pharext packages attached to [releases](./releases). -The following system libraries are required to build this extension: +### Checkout -##### zlib -Provides gzip/zlib/deflate encoding. -Minimum version: 1.2.0.4 -Install on Debian: `apt-get install zlib1g-dev` + git clone github.com:m6w6/ext-http + cd ext-http + /path/to/phpize + ./configure --with-php-config=/path/to/php-config + make + sudo make install +## ChangeLog -#### Optional system libraries: +A comprehensive list of changes can be obtained from the +[PECL website](https://pecl.php.net/package-changelog.php?package=pecl_http). -The following system libraries are optional and provide additional features: +## License -##### libidn -Provides IDNA support in URLs. -Minimum version: none -Install on Debian: `apt-get install libidn11-dev` +ext-http is licensed under the 2-Clause-BSD license, which can be found in +the accompanying [LICENSE](./LICENSE) file. -##### libidn2 -Provides IDNA support in URLs (fallback if libidn is not available). -Minimum version: none -Install on Debian: `apt-get install libidn2-0-dev` +## Contributing -##### libicu -Provides IDNA support in URLs (fallback if libidn is not available). -Minimum version: none -Install on Debian: `apt-get install libicu-dev` +All forms of contribution are welcome! Please see the bundled +[CONTRIBUTING](./CONTRIBUTING.md) note for the general principles followed. -##### libcurl -Provides HTTP request functionality. -Minimum version: 7.18.2 -Install on Debian: `apt-get install libcurl4-openssl-dev` -Note: There are usually different styles of SSL support for libcurl available, so you can replace 'openssl' in the above command f.e. with 'nss' or 'gnutls'. - -##### libevent -Eventloop support for the HTTP client. -Minimum version: none -Install on Debian: `apt-get install libevent-dev` - -### PHP extensions: - -This extension unconditionally depends on the pre-loaded presence of the following PHP extensions: - -* [raphf](https://github.com/m6w6/ext-raphf) -* [propro](https://github.com/m6w6/ext-propro) -* spl - - -If configured ```--with-http-shared-deps``` (default) it depends on the pre-loaded presence of the following extensions, as long as they were available at build time: - -* hash -* iconv -* json (only until < 2.4.0) - -Please ensure that all extension on which pecl/http depends, are loaded before it, e.g in your `php.ini`: - - ; obligatory deps - extension = raphf.so - extension = propro.so - - ; if shared deps were enabled - extension = hash.so - extension = iconv.so - extension = json.so - - ; finally load pecl/http - extension = http.so - -## Conflicts: - -pecl/http-v2 conflicts with the following extensions: - -* http-v1 -* event (only until <= 2.0.3) - -## INI Directives: - -* http.etag.mode = "crc32b" - Default hash method for dynamic response payloads to generate an ETag. - -## Stream Filters: - -The http extension registers the ```http.*``` namespace for its stream filters. Provided stream filters are: - -* http.chunked_decode - Decode a stream encoded with chunked transfer encoding. -* http.chunked_encode - Encode a stream with chunked transfer encoding. -* http.inflate - Decode a stream encoded with deflate/zlib/gzip encoding. -* http.deflate - Encode a stream with deflate/zlib/gzip encoding. - - -## Documentation: - -Documentation is available at https://mdref.m6w6.name/http +The list of past and current contributors is maintained in [THANKS](./THANKS). diff --git a/ThanksTo.txt b/THANKS similarity index 72% rename from ThanksTo.txt rename to THANKS index 67c5b32..d5ddcb5 100644 --- a/ThanksTo.txt +++ b/THANKS @@ -1,9 +1,4 @@ -Thanks To -========= - -People who repeatedly reported issues with this extension in a manner -so they could be fixed in a reasonable way, or suggested useful features -to implement, in alphabetical order: +Thanks go to the following people, who have contributed to this project: Ilia Alshanetsky (ilia at php dot net) Anatol Belski (ab at php dot net) @@ -18,5 +13,3 @@ to implement, in alphabetical order: Travis Swicegood (travis at mashery dot com) Alexey Zakhlestin (indeyets at gmail dot com) Alexander Zhuravlev (zaa at zaa dot pp dot ru) - -Thanks a lot! diff --git a/config.w32 b/config.w32 index 13c24ab..4bd1f69 100644 --- a/config.w32 +++ b/config.w32 @@ -1,131 +1,131 @@ -// config.w32 for pecl/http -// $Id$ - -ARG_ENABLE("http", "whether to enable extended HTTP support", "no"); - -function check_for_main_ext(ext, header) -{ - if (!header) { - header = "php_"+ ext +".h"; - } - - /* When in configure, we're always in the root of PHP source */ - var ext_path = "ext\\" + ext; - - STDOUT.Write("Checking for ext/"+ ext +" ... "); - - if (FSO.FileExists(ext_path + "\\" + header)) { - STDOUT.WriteLine(ext_path); - return ext_path; - } - - STDOUT.WriteLine(""); - return false; -} - -function check_for_pecl_ext(ext, header) -{ - if (!header) { - header = "php_"+ ext +".h"; - } - - var g; - var s = ext +"\\"+ header; - - STDOUT.Write("Checking for pecl/"+ ext +" ... "); - if ( (g = glob(configure_module_dirname +"\\..\\"+ s)) || - (g = glob(configure_module_dirname +"\\..\\..\\..\\pecl\\"+ s))) { - var f = g[0].substr(0, g[0].length - header.length - 1); - STDOUT.WriteLine(f); - return f; - } - STDOUT.WriteLine(""); - return false; -} - -if (PHP_HTTP != "no") { - - EXTENSION("http", - "php_http.c php_http_buffer.c php_http_client.c " + - "php_http_client_request.c php_http_client_response.c " + - "php_http_cookie.c php_http_curl.c php_http_client_curl.c " + - "php_http_encoding.c php_http_env.c php_http_env_request.c " + - "php_http_env_response.c php_http_etag.c php_http_exception.c php_http_filter.c php_http_header_parser.c " + - "php_http_header.c php_http_info.c php_http_message.c php_http_message_body.c php_http_message_parser.c " + - "php_http_misc.c php_http_negotiate.c php_http_object.c php_http_options.c php_http_params.c " + - "php_http_querystring.c php_http_url.c php_http_version.c", - null, - null); - AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support"); - AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions"); - - AC_DEFINE("HAVE_GETHOSTNAME", 1); - - if (PHP_DEBUG != "no") { - ADD_FLAG("CFLAGS_HTTP", "/W3"); - } - - if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) { - AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library"); - ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE"); - } else { - WARNING("zlib encoding functions not enabled; libraries and headers not found"); - } - - if (typeof(PHP_HASH) != "undefined" && PHP_HASH != "no") { - var f; - - if ((f = check_for_pecl_ext("hash")) || (f = check_for_main_ext("hash"))) { - ADD_FLAG("CFLAGS_HTTP", '/I "' + f + '" /DHTTP_HAVE_PHP_HASH_H=1'); - ADD_EXTENSION_DEP("http", "hash", true); - } - } - - if (PHP_SESSION != "no") { - ADD_EXTENSION_DEP("http", "session", true); - } - - if (PHP_ICONV != "no") { - ADD_EXTENSION_DEP("http", "iconv", true); - } - - if (PHP_CURL != "no") { - ADD_EXTENSION_DEP("http", "curl", true); - } - - - CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib"); - if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") && - CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") && - CHECK_LIB(CURL_LIB, "http", PHP_HTTP) && - CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) && - CHECK_LIB("libeay32.lib", "http", PHP_HTTP) && - CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) && - CHECK_LIB("libcurl_a.lib", "http", PHP_HTTP) && - ADD_EXTENSION_DEP("http", "propro", true) && - ADD_EXTENSION_DEP("http", "raphf", true) && - CHECK_LIB("winmm.lib", "http", PHP_HTTP)) { - AC_DEFINE("PHP_HTTP_HAVE_CURL", 1, "Have CURL library"); - AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL"); - AC_DEFINE("PHP_HAVE_CURL_MULTI_STRERROR", 1, ""); - AC_DEFINE("PHP_HAVE_CURL_SHARE_STRERROR", 1, ""); - AC_DEFINE("PHP_HAVE_CURL_EASY_STRERROR", 1, ""); - AC_DEFINE("PHP_HAVE_CURL_EASY_RESET", 1, ""); - AC_DEFINE("PHP_HAVE_CURL_GETFORMDATA", 1, ""); - AC_DEFINE("PHP_HAVE_CURL_FORMGET", 1, ""); - AC_DEFINE("PHP_HAVE_CURL_MULTI_SETOPT", 1, ""); - AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, ""); - - if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") && - CHECK_LIB("libevent.lib", "http", PHP_HTTP) && - CHECK_LIB("libevent_core.lib", "http", PHP_HTTP) && - CHECK_LIB("libevent_extras.lib", "http", PHP_HTTP)) { - - AC_DEFINE("PHP_HTTP_HAVE_EVENT", 1); - AC_DEFINE("PHP_HTTP_HAVE_EVENT2", 1); - AC_DEFINE("PHP_HTTP_EVENT_VERSION", "2.0.21 or greater"); - } - } else { - WARNING("curl convenience functions not enabled; libraries and headers not found"); - } -} +// config.w32 for pecl/http +// $Id$ + +ARG_ENABLE("http", "whether to enable extended HTTP support", "no"); + +function check_for_main_ext(ext, header) +{ + if (!header) { + header = "php_"+ ext +".h"; + } + + /* When in configure, we're always in the root of PHP source */ + var ext_path = "ext\\" + ext; + + STDOUT.Write("Checking for ext/"+ ext +" ... "); + + if (FSO.FileExists(ext_path + "\\" + header)) { + STDOUT.WriteLine(ext_path); + return ext_path; + } + + STDOUT.WriteLine(""); + return false; +} + +function check_for_pecl_ext(ext, header) +{ + if (!header) { + header = "php_"+ ext +".h"; + } + + var g; + var s = ext +"\\"+ header; + + STDOUT.Write("Checking for pecl/"+ ext +" ... "); + if ( (g = glob(configure_module_dirname +"\\..\\"+ s)) || + (g = glob(configure_module_dirname +"\\..\\..\\..\\pecl\\"+ s))) { + var f = g[0].substr(0, g[0].length - header.length - 1); + STDOUT.WriteLine(f); + return f; + } + STDOUT.WriteLine(""); + return false; +} + +if (PHP_HTTP != "no") { + + EXTENSION("http", + "src/php_http.c src/php_http_buffer.c src/php_http_client.c " + + "src/php_http_client_request.c src/php_http_client_response.c " + + "src/php_http_cookie.c src/php_http_curl.c src/php_http_client_curl.c " + + "src/php_http_encoding.c src/php_http_env.c src/php_http_env_request.c " + + "src/php_http_env_response.c src/php_http_etag.c src/php_http_exception.c src/php_http_filter.c src/php_http_header_parser.c " + + "src/php_http_header.c src/php_http_info.c src/php_http_message.c src/php_http_message_body.c src/php_http_message_parser.c " + + "src/php_http_misc.c src/php_http_negotiate.c src/php_http_object.c src/php_http_options.c src/php_http_params.c " + + "src/php_http_querystring.c src/php_http_url.c src/php_http_version.c", + null, + null); + AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support"); + AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions"); + + AC_DEFINE("HAVE_GETHOSTNAME", 1); + + if (PHP_DEBUG != "no") { + ADD_FLAG("CFLAGS_HTTP", "/W3"); + } + + if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) { + AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library"); + ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE"); + } else { + WARNING("zlib encoding functions not enabled; libraries and headers not found"); + } + + if (typeof(PHP_HASH) != "undefined" && PHP_HASH != "no") { + var f; + + if ((f = check_for_pecl_ext("hash")) || (f = check_for_main_ext("hash"))) { + ADD_FLAG("CFLAGS_HTTP", '/I "' + f + '" /DHTTP_HAVE_PHP_HASH_H=1'); + ADD_EXTENSION_DEP("http", "hash", true); + } + } + + if (PHP_SESSION != "no") { + ADD_EXTENSION_DEP("http", "session", true); + } + + if (PHP_ICONV != "no") { + ADD_EXTENSION_DEP("http", "iconv", true); + } + + if (PHP_CURL != "no") { + ADD_EXTENSION_DEP("http", "curl", true); + } + + + CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib"); + if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") && + CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") && + CHECK_LIB(CURL_LIB, "http", PHP_HTTP) && + CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) && + CHECK_LIB("libeay32.lib", "http", PHP_HTTP) && + CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) && + CHECK_LIB("libcurl_a.lib", "http", PHP_HTTP) && + ADD_EXTENSION_DEP("http", "propro", true) && + ADD_EXTENSION_DEP("http", "raphf", true) && + CHECK_LIB("winmm.lib", "http", PHP_HTTP)) { + AC_DEFINE("PHP_HTTP_HAVE_CURL", 1, "Have CURL library"); + AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL"); + AC_DEFINE("PHP_HAVE_CURL_MULTI_STRERROR", 1, ""); + AC_DEFINE("PHP_HAVE_CURL_SHARE_STRERROR", 1, ""); + AC_DEFINE("PHP_HAVE_CURL_EASY_STRERROR", 1, ""); + AC_DEFINE("PHP_HAVE_CURL_EASY_RESET", 1, ""); + AC_DEFINE("PHP_HAVE_CURL_GETFORMDATA", 1, ""); + AC_DEFINE("PHP_HAVE_CURL_FORMGET", 1, ""); + AC_DEFINE("PHP_HAVE_CURL_MULTI_SETOPT", 1, ""); + AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, ""); + + if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") && + CHECK_LIB("libevent.lib", "http", PHP_HTTP) && + CHECK_LIB("libevent_core.lib", "http", PHP_HTTP) && + CHECK_LIB("libevent_extras.lib", "http", PHP_HTTP)) { + + AC_DEFINE("PHP_HTTP_HAVE_EVENT", 1); + AC_DEFINE("PHP_HTTP_HAVE_EVENT2", 1); + AC_DEFINE("PHP_HTTP_EVENT_VERSION", "2.0.21 or greater"); + } + } else { + WARNING("curl convenience functions not enabled; libraries and headers not found"); + } +} diff --git a/config9.m4 b/config9.m4 index 273f038..da682f7 100644 --- a/config9.m4 +++ b/config9.m4 @@ -31,22 +31,22 @@ if test "$PHP_HTTP" != "no"; then AC_CHECK_PROG(SED, sed, sed) ]) ]) - + AC_PROG_CPP - + if test "$PHP_HTTP_SHARED_DEPS" != "no"; then AC_DEFINE([PHP_HTTP_SHARED_DEPS], [1], [ ]) else AC_DEFINE([PHP_HTTP_SHARED_DEPS], [0], [ ]) fi - + dnl dnl HTTP_SHARED_DEP(name[, code-if-yes[, code-if-not]]) dnl AC_DEFUN([HTTP_SHARED_DEP], [ extname=$1 haveext=$[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__) - + AC_MSG_CHECKING([whether to add a dependency on ext/$extname]) if test "$PHP_HTTP_SHARED_DEPS" = "no"; then AC_MSG_RESULT([no]) @@ -63,7 +63,7 @@ if test "$PHP_HTTP" != "no"; then $3 fi ]) - + dnl dnl HTTP_HAVE_PHP_EXT(name[, code-if-yes[, code-if-not]]) dnl @@ -92,7 +92,7 @@ if test "$PHP_HTTP" != "no"; then $3 fi ]) - + dnl dnl HTTP_CURL_SSL_LIB_CHECK(ssllib[, code-if-yes[, code-if-not]) dnl @@ -120,7 +120,7 @@ if test "$PHP_HTTP" != "no"; then $3 ]) ]) - + dnl ---- dnl STDC @@ -240,7 +240,7 @@ dnl ---- PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) fi fi - + dnl ---- dnl CURL dnl ---- @@ -260,7 +260,7 @@ dnl ---- AC_MSG_RESULT([not found]) 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 @@ -275,7 +275,7 @@ dnl ---- else AC_MSG_RESULT([found: $CURL_CONFIG]) fi - + dnl RHEL6: 7.19.7 dnl SUSE11: 7.19.7 dnl Debian wheezy: 7.26.0 @@ -287,7 +287,7 @@ dnl ---- 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 HTTP2 support in libcurl]) if $CURL_CONFIG --features | $EGREP -q HTTP2; then AC_MSG_RESULT([yes]) @@ -295,11 +295,11 @@ dnl ---- else AC_MSG_RESULT([no]) fi - + dnl dnl compile tests dnl - + save_INCLUDES="$INCLUDES" INCLUDES= save_LIBS="$LIBS" @@ -308,14 +308,14 @@ dnl ---- CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`" save_LDFLAGS="$LDFLAGS" LDFLAGS="$ld_runpath_switch$CURL_DIR/$PHP_LIBDIR" - + AC_MSG_CHECKING([for SSL support in libcurl]) CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` CURL_SSL_LIBS="" if test "$CURL_SSL" = "SSL"; then AC_MSG_RESULT([yes]) AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ]) - + HTTP_CURL_SSL_LIB_CHECK(OpenSSL, [ AC_CHECK_HEADER([openssl/ssl.h], [ AC_CHECK_HEADER([openssl/crypto.h], [ @@ -345,7 +345,7 @@ dnl ---- dnl no CURL_SSL AC_MSG_RESULT([no]) fi - + AC_MSG_CHECKING([for ares support in libcurl]) AC_TRY_RUN([ #include @@ -364,7 +364,7 @@ dnl ---- ], [ AC_MSG_RESULT([no]) ]) - + AC_MSG_CHECKING([whether CURLOPT_TLSAUTH_TYPE expects CURL_TLSAUTH_SRP or literal "SRP"]) AC_TRY_RUN([ #include @@ -391,24 +391,24 @@ dnl ---- AC_MSG_RESULT([neither]) ], [ AC_MSG_RESULT([neither]) - ]) + ]) ], [ AC_MSG_RESULT([neither]) ]) - + INCLUDES="$save_INCLUDES" LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS" - + if test -n "$CURL_SSL_LIBS"; then for CURL_SSL_LIB in $CURL_SSL_LIBS; do PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL_LIB], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD) done fi - + 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" "/etc/ssl/certs/ca-bundle.crt"; do @@ -423,7 +423,7 @@ dnl ---- 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) @@ -453,9 +453,9 @@ dnl ---- AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ]) else AC_MSG_RESULT([found in $EVENT_DIR]) - + AC_MSG_CHECKING([for libevent version, roughly]) - + if test -f "$EVENT_DIR/include/event2/event.h"; then EVENT_VER="`$AWK '/_EVENT_VERSION/ {gsub(/\"/,\"\",$3); print $3}' < $EVENT_DIR/include/event2/event-config.h`" AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ]) @@ -473,7 +473,7 @@ dnl ---- fi AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ]) AC_MSG_RESULT([$EVENT_VER]) - + PHP_ADD_INCLUDE($EVENT_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL]) @@ -573,90 +573,59 @@ dnl ---- dnl ---- dnl DONE dnl ---- + PHP_ADD_INCLUDE(src) + PHP_ADD_BUILD_DIR(src) PHP_HTTP_SOURCES="\ - php_http_buffer.c \ - php_http.c \ - php_http_client.c \ - php_http_client_curl.c \ - php_http_client_request.c \ - php_http_client_response.c \ - php_http_cookie.c \ - php_http_curl.c \ - php_http_encoding.c \ - php_http_env.c \ - php_http_env_request.c \ - php_http_env_response.c \ - php_http_etag.c \ - php_http_exception.c \ - php_http_filter.c \ - php_http_header_parser.c \ - php_http_header.c \ - php_http_info.c \ - php_http_message_body.c \ - php_http_message.c \ - php_http_message_parser.c \ - php_http_misc.c \ - php_http_negotiate.c \ - php_http_object.c \ - php_http_options.c \ - php_http_params.c \ - php_http_querystring.c \ - php_http_url.c \ - php_http_version.c \ + src/php_http_buffer.c \ + src/php_http.c \ + src/php_http_client.c \ + src/php_http_client_curl.c \ + src/php_http_client_request.c \ + src/php_http_client_response.c \ + src/php_http_cookie.c \ + src/php_http_curl.c \ + src/php_http_encoding.c \ + src/php_http_env.c \ + src/php_http_env_request.c \ + src/php_http_env_response.c \ + src/php_http_etag.c \ + src/php_http_exception.c \ + src/php_http_filter.c \ + src/php_http_header_parser.c \ + src/php_http_header.c \ + src/php_http_info.c \ + src/php_http_message_body.c \ + src/php_http_message.c \ + src/php_http_message_parser.c \ + src/php_http_misc.c \ + src/php_http_negotiate.c \ + src/php_http_object.c \ + src/php_http_options.c \ + src/php_http_params.c \ + src/php_http_querystring.c \ + src/php_http_url.c \ + src/php_http_version.c \ " PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared) - + dnl shared extension deps HTTP_SHARED_DEP([hash]) HTTP_SHARED_DEP([iconv]) - + dnl extension deps PHP_ADD_EXTENSION_DEP([http], [raphf], true) PHP_ADD_EXTENSION_DEP([http], [propro], true) - + PHP_SUBST([HTTP_SHARED_LIBADD]) - PHP_HTTP_HEADERS=" - php_http_api.h \ - php_http_buffer.h \ - php_http_curl_client.h \ - php_http_curl_client_datashare.h \ - php_http_client_datashare.h \ - php_http_client_factory.h \ - php_http_client.h \ - php_http_client_interface.h \ - php_http_curl_client_pool.h \ - php_http_client_pool.h \ - php_http_client_request.h \ - php_http_client_response.h \ - php_http_cookie.h \ - php_http_curl.h \ - php_http_encoding.h \ - php_http_env.h \ - php_http_env_request.h \ - php_http_env_response.h \ - php_http_etag.h \ - php_http_exception.h \ - php_http_filter.h \ - php_http.h \ - php_http_header_parser.h \ - php_http_header.h \ - php_http_info.h \ - php_http_message_body.h \ - php_http_message.h \ - php_http_message_parser.h \ - php_http_misc.h \ - php_http_negotiate.h \ - php_http_object.h \ - php_http_options.h \ - php_http_params.h \ - php_http_querystring.h \ - php_http_response_codes.h \ - php_http_url.h \ - php_http_utf8.h \ - php_http_version.h \ - " - PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS) + PHP_HTTP_HEADERS=`(cd $ext_srcdir/src && echo *.h)` + PHP_INSTALL_HEADERS(ext/http, php_http.h $PHP_HTTP_HEADERS) + PHP_SUBST([PHP_HTTP_HEADERS]) + PHP_HTTP_SRCDIR=$ext_srcdir + PHP_SUBST([PHP_HTTP_SRCDIR]) + PHP_HTTP_BUILDDIR=$ext_builddir + PHP_SUBST([PHP_HTTP_BUILDDIR]) + PHP_ADD_MAKEFILE_FRAGMENT AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support]) fi diff --git a/package.xml b/package.xml index df97ad9..95578ea 100644 --- a/package.xml +++ b/package.xml @@ -1,4 +1,4 @@ - + pecl.php.net Extended HTTP Support stable stable - BSD, revised + BSD-2-Clause - + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -329,6 +333,14 @@ http://dev.iworks.at/ext-http/lcov/ext/http/ + + + + + + + + @@ -336,7 +348,7 @@ http://dev.iworks.at/ext-http/lcov/ext/http/ 5.3.0 7.0.0 - 7.0.0 + 7.0.0 1.4.1 @@ -345,12 +357,16 @@ http://dev.iworks.at/ext-http/lcov/ext/http/ raphf pecl.php.net 1.1.0 + 2.0.0dev + 2.0.0dev raphf propro pecl.php.net 1.0.0 + 2.0.0dev + 2.0.0dev propro diff --git a/bench_select_vs_event.php b/scripts/bench_select_vs_event.php similarity index 100% rename from bench_select_vs_event.php rename to scripts/bench_select_vs_event.php diff --git a/check_package-xml.php b/scripts/check_package-xml.php similarity index 67% rename from check_package-xml.php rename to scripts/check_package-xml.php index 32a1e73..e422c6a 100755 --- a/check_package-xml.php +++ b/scripts/check_package-xml.php @@ -24,6 +24,9 @@ if (($xml = simplexml_load_file($file))) { if (is_gitignored($file)) { continue; } + if (is_commonly_ignored($file)) { + continue; + } if (!is_dir($file)) { if (!in_array($file, $xml_files)) { echo "Missing file $file\n"; @@ -55,21 +58,43 @@ function stdin_is_readable() { } function is_gitignored($file) { - static $gitignore; - + static $gitignore, $gitmodules; + + if (!isset($gitmodules)) { + if (is_readable("./.gitmodules")) { + $gitmodules = explode("\n", `git submodule status | awk '{printf$2}'`); + } else { + $gitmodules = false; + } + } if (!isset($gitignore)) { - if (is_readable(".gitignore")) { - $gitignore = explode("\n", `find | git check-ignore --stdin`); + if (is_readable("./.gitignore")) { + $ignore_submodules = $gitmodules ? " ! -path './".implode("/*' ! -path './", $gitmodules)."/*'" : ""; + $gitignore = explode("\n", `find . $ignore_submodules | git check-ignore --stdin`); } else { $gitignore = false; } } if ($gitignore) { - return in_array($file, $gitignore); + if (in_array($file, $gitignore)) { + return true; + } + } + if ($gitmodules) { + foreach ($gitmodules as $module) { + if (fnmatch("./$module/*", $file)) { + return true; + } + } } return false; } +function is_commonly_ignored($file) { + return fnmatch("./.git*", $file) + || in_array($file, ["./package.xml", "./package2.xml", "./.travis.yml", "./.editorconfig"], true); +} + function xmllist(SimpleXmlElement $dir, $p = ".", &$a = null) { settype($a, "array"); $p = trim($p, "/") . "/" . trim($dir["name"], "/") . "/"; diff --git a/gen_curlinfo.php b/scripts/gen_curlinfo.php similarity index 100% rename from gen_curlinfo.php rename to scripts/gen_curlinfo.php diff --git a/reflection2php.php b/scripts/gen_stubs.php similarity index 100% rename from reflection2php.php rename to scripts/gen_stubs.php diff --git a/gen_travis_yml.php b/scripts/gen_travis_yml.php similarity index 100% rename from gen_travis_yml.php rename to scripts/gen_travis_yml.php diff --git a/gen_utf8.php b/scripts/gen_utf8.php similarity index 100% rename from gen_utf8.php rename to scripts/gen_utf8.php diff --git a/php_http.c b/src/php_http.c similarity index 100% rename from php_http.c rename to src/php_http.c diff --git a/php_http_api.h b/src/php_http_api.h similarity index 100% rename from php_http_api.h rename to src/php_http_api.h diff --git a/php_http_buffer.c b/src/php_http_buffer.c similarity index 100% rename from php_http_buffer.c rename to src/php_http_buffer.c diff --git a/php_http_buffer.h b/src/php_http_buffer.h similarity index 100% rename from php_http_buffer.h rename to src/php_http_buffer.h diff --git a/php_http_client.c b/src/php_http_client.c similarity index 100% rename from php_http_client.c rename to src/php_http_client.c diff --git a/php_http_client.h b/src/php_http_client.h similarity index 100% rename from php_http_client.h rename to src/php_http_client.h diff --git a/php_http_client_curl.c b/src/php_http_client_curl.c similarity index 100% rename from php_http_client_curl.c rename to src/php_http_client_curl.c diff --git a/php_http_client_curl.h b/src/php_http_client_curl.h similarity index 100% rename from php_http_client_curl.h rename to src/php_http_client_curl.h diff --git a/php_http_client_request.c b/src/php_http_client_request.c similarity index 100% rename from php_http_client_request.c rename to src/php_http_client_request.c diff --git a/php_http_client_request.h b/src/php_http_client_request.h similarity index 100% rename from php_http_client_request.h rename to src/php_http_client_request.h diff --git a/php_http_client_response.c b/src/php_http_client_response.c similarity index 100% rename from php_http_client_response.c rename to src/php_http_client_response.c diff --git a/php_http_client_response.h b/src/php_http_client_response.h similarity index 100% rename from php_http_client_response.h rename to src/php_http_client_response.h diff --git a/php_http_cookie.c b/src/php_http_cookie.c similarity index 100% rename from php_http_cookie.c rename to src/php_http_cookie.c diff --git a/php_http_cookie.h b/src/php_http_cookie.h similarity index 100% rename from php_http_cookie.h rename to src/php_http_cookie.h diff --git a/php_http_curl.c b/src/php_http_curl.c similarity index 100% rename from php_http_curl.c rename to src/php_http_curl.c diff --git a/php_http_curl.h b/src/php_http_curl.h similarity index 100% rename from php_http_curl.h rename to src/php_http_curl.h diff --git a/php_http_encoding.c b/src/php_http_encoding.c similarity index 100% rename from php_http_encoding.c rename to src/php_http_encoding.c diff --git a/php_http_encoding.h b/src/php_http_encoding.h similarity index 100% rename from php_http_encoding.h rename to src/php_http_encoding.h diff --git a/php_http_env.c b/src/php_http_env.c similarity index 100% rename from php_http_env.c rename to src/php_http_env.c diff --git a/php_http_env.h b/src/php_http_env.h similarity index 100% rename from php_http_env.h rename to src/php_http_env.h diff --git a/php_http_env_request.c b/src/php_http_env_request.c similarity index 100% rename from php_http_env_request.c rename to src/php_http_env_request.c diff --git a/php_http_env_request.h b/src/php_http_env_request.h similarity index 100% rename from php_http_env_request.h rename to src/php_http_env_request.h diff --git a/php_http_env_response.c b/src/php_http_env_response.c similarity index 100% rename from php_http_env_response.c rename to src/php_http_env_response.c diff --git a/php_http_env_response.h b/src/php_http_env_response.h similarity index 100% rename from php_http_env_response.h rename to src/php_http_env_response.h diff --git a/php_http_etag.c b/src/php_http_etag.c similarity index 100% rename from php_http_etag.c rename to src/php_http_etag.c diff --git a/php_http_etag.h b/src/php_http_etag.h similarity index 100% rename from php_http_etag.h rename to src/php_http_etag.h diff --git a/php_http_exception.c b/src/php_http_exception.c similarity index 100% rename from php_http_exception.c rename to src/php_http_exception.c diff --git a/php_http_exception.h b/src/php_http_exception.h similarity index 100% rename from php_http_exception.h rename to src/php_http_exception.h diff --git a/php_http_filter.c b/src/php_http_filter.c similarity index 100% rename from php_http_filter.c rename to src/php_http_filter.c diff --git a/php_http_filter.h b/src/php_http_filter.h similarity index 100% rename from php_http_filter.h rename to src/php_http_filter.h diff --git a/php_http_header.c b/src/php_http_header.c similarity index 100% rename from php_http_header.c rename to src/php_http_header.c diff --git a/php_http_header.h b/src/php_http_header.h similarity index 100% rename from php_http_header.h rename to src/php_http_header.h diff --git a/php_http_header_parser.c b/src/php_http_header_parser.c similarity index 100% rename from php_http_header_parser.c rename to src/php_http_header_parser.c diff --git a/php_http_header_parser.h b/src/php_http_header_parser.h similarity index 100% rename from php_http_header_parser.h rename to src/php_http_header_parser.h diff --git a/php_http_info.c b/src/php_http_info.c similarity index 100% rename from php_http_info.c rename to src/php_http_info.c diff --git a/php_http_info.h b/src/php_http_info.h similarity index 100% rename from php_http_info.h rename to src/php_http_info.h diff --git a/php_http_message.c b/src/php_http_message.c similarity index 100% rename from php_http_message.c rename to src/php_http_message.c diff --git a/php_http_message.h b/src/php_http_message.h similarity index 100% rename from php_http_message.h rename to src/php_http_message.h diff --git a/php_http_message_body.c b/src/php_http_message_body.c similarity index 100% rename from php_http_message_body.c rename to src/php_http_message_body.c diff --git a/php_http_message_body.h b/src/php_http_message_body.h similarity index 100% rename from php_http_message_body.h rename to src/php_http_message_body.h diff --git a/php_http_message_parser.c b/src/php_http_message_parser.c similarity index 100% rename from php_http_message_parser.c rename to src/php_http_message_parser.c diff --git a/php_http_message_parser.h b/src/php_http_message_parser.h similarity index 100% rename from php_http_message_parser.h rename to src/php_http_message_parser.h diff --git a/php_http_misc.c b/src/php_http_misc.c similarity index 100% rename from php_http_misc.c rename to src/php_http_misc.c diff --git a/php_http_misc.h b/src/php_http_misc.h similarity index 100% rename from php_http_misc.h rename to src/php_http_misc.h diff --git a/php_http_negotiate.c b/src/php_http_negotiate.c similarity index 100% rename from php_http_negotiate.c rename to src/php_http_negotiate.c diff --git a/php_http_negotiate.h b/src/php_http_negotiate.h similarity index 100% rename from php_http_negotiate.h rename to src/php_http_negotiate.h diff --git a/php_http_object.c b/src/php_http_object.c similarity index 100% rename from php_http_object.c rename to src/php_http_object.c diff --git a/php_http_object.h b/src/php_http_object.h similarity index 100% rename from php_http_object.h rename to src/php_http_object.h diff --git a/php_http_options.c b/src/php_http_options.c similarity index 100% rename from php_http_options.c rename to src/php_http_options.c diff --git a/php_http_options.h b/src/php_http_options.h similarity index 100% rename from php_http_options.h rename to src/php_http_options.h diff --git a/php_http_params.c b/src/php_http_params.c similarity index 100% rename from php_http_params.c rename to src/php_http_params.c diff --git a/php_http_params.h b/src/php_http_params.h similarity index 100% rename from php_http_params.h rename to src/php_http_params.h diff --git a/php_http_querystring.c b/src/php_http_querystring.c similarity index 100% rename from php_http_querystring.c rename to src/php_http_querystring.c diff --git a/php_http_querystring.h b/src/php_http_querystring.h similarity index 100% rename from php_http_querystring.h rename to src/php_http_querystring.h diff --git a/php_http_response_codes.h b/src/php_http_response_codes.h similarity index 100% rename from php_http_response_codes.h rename to src/php_http_response_codes.h diff --git a/php_http_url.c b/src/php_http_url.c similarity index 100% rename from php_http_url.c rename to src/php_http_url.c diff --git a/php_http_url.h b/src/php_http_url.h similarity index 100% rename from php_http_url.h rename to src/php_http_url.h diff --git a/php_http_utf8.h b/src/php_http_utf8.h similarity index 100% rename from php_http_utf8.h rename to src/php_http_utf8.h diff --git a/php_http_version.c b/src/php_http_version.c similarity index 100% rename from php_http_version.c rename to src/php_http_version.c diff --git a/php_http_version.h b/src/php_http_version.h similarity index 100% rename from php_http_version.h rename to src/php_http_version.h -- 2.30.2