diff options
| author | John Anderson <sontek@gmail.com> | 2015-01-01 22:02:17 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-01-01 22:02:17 -0800 |
| commit | 538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f (patch) | |
| tree | 5fe59ae987c429d8dea0babbde26ee91f41ff34f /docs/narr | |
| parent | 582c2ed180120d07c825e4897350f5d1a6285afa (diff) | |
| parent | 731a8e8380bbf9b41298c0417795e68899b91953 (diff) | |
| download | pyramid-538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f.tar.gz pyramid-538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f.tar.bz2 pyramid-538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f.zip | |
Merge branch 'master' of https://github.com/sontek/pyramid into support_more_features_in_routes
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/router.rst | 3 | ||||
| -rw-r--r-- | docs/narr/webob.rst | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/narr/router.rst b/docs/narr/router.rst index e82b66801..693217a6b 100644 --- a/docs/narr/router.rst +++ b/docs/narr/router.rst @@ -119,7 +119,8 @@ request enters a :app:`Pyramid` application through to the point that #. The :term:`thread local` stack is popped. -.. image:: router.png +.. image:: ../_static/pyramid_router.svg + :alt: Pyramid Router This is a very high-level overview that leaves out various details. For more detail about subsystems invoked by the :app:`Pyramid` router such as diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst index 6a331e4bf..0eb070b06 100644 --- a/docs/narr/webob.rst +++ b/docs/narr/webob.rst @@ -310,6 +310,14 @@ Python's ``urllib2`` instead of a Javascript AJAX request: req = urllib2.Request('http://localhost:6543/', json_payload, headers) resp = urllib2.urlopen(req) +If you are doing Cross-origin resource sharing (CORS), then the standard +requires the browser to do a pre-flight HTTP OPTIONS request. The easiest way +to handling this is adding an extra ``view_config`` for the same route, with +``request_method`` set to ``OPTIONS``, and setting the desired response header +before returning. You can find examples of response headers here_. + +.. _here: https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS#Preflighted_requests + .. index:: single: cleaning up after request |