prepare v4.2.5

[m6w6/ext-http] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4f36007528471f591de8585454a686f444f9000f..99028c98e2a0ac08d5554e04a6721c807dc5cb46 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 .cproject
 .deps
+*.dep
 .libs/
 .project
-Makefile
+/Makefile
 Makefile.fragments
 Makefile.global
 Makefile.objects
@@ -10,6 +11,7 @@ acinclude.m4
 aclocal.m4
 autom4te.cache/
 build/
+config.cache
 config.guess
 config.h
 config.h.in
@@ -18,6 +20,7 @@ config.nice
 config.status
 config.sub
 configure
+configure.ac
 configure.in
 http.la
 install-sh
@@ -41,17 +44,21 @@ lcov_data
 *~
 *.phar
 !travis/*.phar
+bench/
 vendor/
-<<<<<<< HEAD
 /php_http_api.h
 /php_http_buffer.h
 /php_http_client.h
 /php_http_client_curl.h
+/php_http_client_curl_event.h
+/php_http_client_curl_user.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_encoding_zlib.h
+/php_http_encoding_brotli.h
 /php_http_env.h
 /php_http_env_request.h
 /php_http_env_response.h
@@ -75,40 +82,6 @@ vendor/
 /php_http_utf8.h
 /php_http_version.h
 /tests/helper/server.log
-=======
-tests/helper/server.log
-php_http_api.h
-php_http_buffer.h
-php_http_client.h
-php_http_client_curl.h
-php_http_client_curl_event.h
-php_http_client_curl_user.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_header.h
-php_http_header_parser.h
-php_http_info.h
-php_http_message.h
-php_http_message_body.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
->>>>>>> v2.6.x
-*.gcov
+*gcov
+*lcov
+.vscode