missing changes for 4.1 and 4.2

[m6w6/ext-http] / .gitignore

diff --git a/.gitignore b/.gitignore
index 348538c871f9b28e83aab75ed0d0bc888950a349..1d981fb5ff3174373a9f63defb7fd0ab6805fe14 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .cproject
 .deps
+*.dep
 .libs/
 .project
 Makefile
@@ -41,17 +42,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,39 +80,5 @@ 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
+*lcov