Merge branch 'R_2_5'

diff --git a/README.md b/README.md
index 19738da8115e14b39d0c3c46939ed55ed5904c23..6d4a56bcfe2f3a9ab23c01c58970f826c2b15331 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # ext-http
 
 [![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=master)](https://travis-ci.org/m6w6/ext-http)
+[![Join the chat at https://gitter.im/m6w6/ext-http](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/m6w6/ext-http)
 
 Extended HTTP support. Again.
 

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 4bb37b775a461b54e0e2787e97e312d7e0ca8f64..e42ec312b66e0a1b46f5388d80893c31cb3c4101 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -44,3 +44,10 @@ after_script:
  - test -e tests/helper/server.log && cat tests/helper/server.log
 
 sudo: false
+notifications:
+ webhooks:
+  urls:
+   - https://webhooks.gitter.im/e/28d35158ac7e385bd14d
+  on_success: change
+  on_failure: always
+  on_start: never