Commit Graph

477 Commits

Author SHA1 Message Date
John Sheehan b3151d45b0 Merge pull request #211 from Runscope/gunicorn
Restore gunicorn in the list of third-party requirements
2015-02-04 09:35:24 -08:00
Ryan Park 7a10451dd4 Restore gunicorn in the list of third-party requirements
`gunicorn==18.0` had previously been listed in requirements.txt, but I
removed it in commit d851a7e2a1 for
compatibility with the new httpbin.org hosting platform.

gunicorn 19.2 has (finally) been released, and this version will work
correctly for httpbin.org. This change adds `gunicorn==19.2` back to
requirements.txt.

This may also fix problems deploying to Heroku reported by @sigmavirus24,
which may have been caused by the requirement change in
d851a7e2a1.
2015-02-03 10:23:54 -08:00
John Sheehan ecd0a9c7a9 Merge pull request #208 from Runscope/https-headers
Allow httpbin to recognize SSL connections from more reverse proxy headers
2015-01-26 14:21:40 -08:00
Ryan Park 3b87123f9f Allow httpbin to recognize SSL connections from more reverse proxy headers
There's no standard for the headers added by a reverse proxy when it handles
an https incoming request. Some proxies add `X-Forwarded-Proto` but others add
`X-Forwarded-Protocol` or `X-Forwarded-Ssl`. This change lets httpbin work with
reverse proxies use any of these headers. It also instructs httpbin to ignore
those headers because they're added by a proxy.

Fixes #207. @sigmavirus24 was correct, Heroku uses `X-Forwarded-Proto` but the
Runscope hosting platform uses `X-Forwarded-Protocol`.
2015-01-26 09:54:38 -08:00
Ryan Park 0f4d3ff3d2 Initialize Bugsnag exception handler, when desired.
At Runscope we use Bugsnag to track application exceptions. This commit allows
you to use Bugsnag to track httpbin exceptions. If you want to do this, you'll
need to set the environment variable BUGSNAG_API_KEY and optionally set the
variable BUGSNAG_RELEASE_STAGE. You'll also need to install the Python client
for Bugsnag, with `pip install bugsnag`.
2015-01-16 13:20:48 -08:00
Ryan Park 681553d691 Add the Runscope-Service header to the list of filtered headers
This comes from the Runscope hosting infrastructure, not from the client.
2015-01-16 10:59:44 -08:00
Ryan Park d851a7e2a1 Modifications to enable hosting by Runscope
I removed the gunicorn requirement. At Runscope we need a custom version of
gunicorn, and the requirement isn't strictly necessary for third parties to
use this project. (They might want to host under a different WSGI server
anyway.)

Also updated the README to remove some Heroku references.
2015-01-16 10:38:01 -08:00
Ian Cordasco 28f8066c3a Merge pull request #193 from msabramo/image
Update /image and add /image/{jpeg,png,webp}
2015-01-05 21:21:26 -06:00
Marc Abramowitz 528db4bc38 Delete Makefile
Deprecates `make html` and `make run`
Refs: #97, #186, #200
2015-01-02 21:12:52 -08:00
Marc Abramowitz be53651b3a Update /image and add /image/{jpeg,png,webp}
Fixes #183
2014-12-25 08:26:09 -08:00
Ian Cordasco 6b7676ba80 Merge pull request #161 from edgurgel/fix-redirect
Fix /redirect to return absolute URL
2014-12-23 19:56:38 -06:00
John Sheehan 99bf12b6a1 bump to 0.2.1 2014-12-23 15:41:25 -08:00
John Sheehan 1b1853f9f4 Merge pull request #196 from msabramo/README_table
README.rst: Display URLs in a table
2014-12-23 15:29:02 -08:00
Marc Abramowitz f6b8c9bdf7 README.rst: Display URLs in a table 2014-12-23 14:04:37 -08:00
John Sheehan 388a3a8e07 Merge pull request #195 from msabramo/fix_README_links
README.rst: Fix links
2014-12-23 13:14:18 -08:00
John Sheehan b92306e065 Merge pull request #194 from msabramo/utf8
/encoding/utf8: Add to httpbin.1.html, link to source of UTF-8-demo.txt
2014-12-23 13:13:32 -08:00
Marc Abramowitz 7f81b32d7b README.rst: Fix links
that were broken by Markdown => reST conversion, by removing all double
backquotes. I don't think reST allows double backquote (code font)
nested inside a link.
2014-12-23 12:09:47 -08:00
Marc Abramowitz 771be3aa66 httpbin.1.html: Add /encoding/utf8 2014-12-23 11:18:11 -08:00
Marc Abramowitz f1f4bee83f Link to source of UTF-8-demo.txt 2014-12-23 11:17:37 -08:00
John Sheehan 07dd308112 Merge pull request #189 from msabramo/gunicorn_19_log_file_to_stdout
Procfile: Add --log-file -
2014-12-23 10:00:02 -08:00
John Sheehan 8709122685 Merge pull request #190 from msabramo/utf8
Add /encoding/utf8 endpoint
2014-12-23 09:59:38 -08:00
John Sheehan 0b6f638b67 Merge pull request #192 from tatsuhiro-t/secure-cookies
Add secure attribute to cookies if wsgi.url_scheme == 'https'
2014-12-23 09:50:59 -08:00
Ian Cordasco 56b20baab4 Merge pull request #187 from msabramo/convert_readme_to_reST
README.md => README.rst
2014-12-23 07:34:23 -06:00
Tatsuhiro Tsujikawa e1024d989c Add secure attribute to cookies if wsgi.url_scheme == 'https' 2014-12-23 19:08:48 +09:00
Eduardo Gurgel 54fc281ef7 Fix /redirect to return absolute URL 2014-12-23 19:31:44 +13:00
Marc Abramowitz 57c44f6748 Add /encoding/utf8 endpoint
Fixes #10
2014-12-22 19:23:16 -08:00
Marc Abramowitz 008bfee25e Procfile: Add --log-file -
so that output gets logged on gunicorn==19.1.1; otherwise it's totally
silent, which sucks.
2014-12-22 19:13:30 -08:00
Ian Cordasco 8f61f1f9ea Merge pull request #188 from msabramo/add_newline_to_end_of_Procfile
Procfile: Add newline to end of file
2014-12-22 21:07:44 -06:00
Marc Abramowitz 6ee9f407c6 Procfile: Add newline to end of file
Because that's a UNIX convention - see
http://stackoverflow.com/questions/729692/why-should-files-end-with-a-newline
2014-12-22 18:59:29 -08:00
Marc Abramowitz b9d81b2e0b README.md => README.rst 2014-12-22 17:46:25 -08:00
John Sheehan b16206b80a Merge pull request #184 from msabramo/travis
Add .travis.yml for Travis CI
2014-12-22 16:51:40 -08:00
Marc Abramowitz 34003b702a README.md: Add Travis CI build badge 2014-12-22 16:42:57 -08:00
Marc Abramowitz 6ad0781991 Fix Travis py34 failure
by not relying on core.pyc file in test
2014-12-22 16:37:07 -08:00
Marc Abramowitz 3c85fbf3eb Add .travis.yml for Travis CI 2014-12-22 16:24:21 -08:00
John Sheehan b226607c19 Merge branch 'msabramo-GH-168' 2014-12-22 16:22:47 -08:00
John Sheehan 5858e3d434 Merge branch 'GH-168' of https://github.com/msabramo/httpbin into msabramo-GH-168 2014-12-22 16:21:21 -08:00
John Sheehan 6930f8225d Merge pull request #160 from rictic/master
Send an explicit Content-Length header with /drip/
2014-12-22 16:19:10 -08:00
Marc Abramowitz 24dadf082c GH-168: Add newline to end of page
Fixes GH-168
2014-12-22 16:18:12 -08:00
John Sheehan 6dc5270b57 Merge pull request #158 from derflocki/wp-allow-headers
support Access-Control-Request-Headers
2014-12-22 16:15:05 -08:00
John Sheehan f62305569c Merge pull request #166 from shurane/patch-1
Show way to run httpbin as a python module.
2014-12-22 15:52:52 -08:00
John Sheehan 21782f94ef more meta updates 2014-12-22 15:42:08 -08:00
John Sheehan 0cdfb9e42b readme update 2014-12-22 15:34:45 -08:00
John Sheehan 156525fe31 Merge branch 'master' of github.com:Runscope/httpbin 2014-12-22 15:29:07 -08:00
John Sheehan 54873992c9 Merge pull request #171 from msabramo/GH-162
GH-162: No 500 w/ better handle missing dict keys
2014-12-22 15:22:56 -08:00
John Sheehan 3031459c05 Merge pull request #177 from mrkd/master
Update template to fix deploy to Heroku button
2014-12-22 15:22:11 -08:00
John Sheehan 8c11ed9883 Merge pull request #172 from msabramo/GH-125
GH-125: Support multiple headers with same key
2014-12-22 15:21:40 -08:00
John Sheehan 64aa956ad1 Merge pull request #170 from msabramo/patch-1
Imports; remove dup base64, alpha sort
2014-12-22 15:20:19 -08:00
Mark Norgren 79d62dbaef Update httpbin.1.html 2014-12-15 15:47:12 -06:00
Frank Stratton ☺ 562e687cae Merge pull request #176 from mrkd/master
Update Readme for Deploy to Heroku button fix
2014-12-15 13:35:24 -08:00
Mark Norgren bf09ea0f5a Update Readme for Deploy to Heroku button fix 2014-12-15 15:25:13 -06:00