Skip to content

Commit 28d4391

Browse files
mattmakaimattmakai
committed
converting wsgi server diagram
1 parent 41b5f25 commit 28d4391

File tree

8 files changed

+92
-17
lines changed

8 files changed

+92
-17
lines changed

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2013-12-04T09:54:26Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2013-12-04T16:43:19Z</updated></feed>

‎img/web-browser-server-wsgi.png‎

23.5 KB
Loading

‎index.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,12 @@ <h1>WSGI Server</h1>
336336
WSGI v1.0 is superseded by
337337
<a class="reference external" href="http://www.python.org/dev/peps/pep-3333/">PEP 3333</a>, which defines the
338338
v1.0.1 WSGI standard.</p>
339-
<hr class="docutils" />
340-
<img alt="WSGI Server &lt;-&gt; Web server &lt;-&gt; Browser" src="../img/wsgi-server-browser.png" />
339+
<img alt="WSGI Server &lt;-&gt; Web server &lt;-&gt; Browser" class="technical-diagram" src="../img/web-browser-server-wsgi.png" />
341340
<p>Requests from the browser that are not for static assets (this is specified
342341
in the web server's configuration which requests are for static assets and
343342
which are not) are passed to the WSGI server. Once the request is
344-
processed by the WSGI server, the request is passed back through the
345-
web server and onto the browser.</p>
346-
<hr class="docutils" />
343+
processed and generated by the WSGI server, the response is passed
344+
back through the web server and onto the browser.</p>
347345
<div class="section" id="wsgi-resources">
348346
<h2>WSGI Resources</h2>
349347
<p><a class="reference external" href="http://www.python.org/dev/peps/pep-0333/">PEP 0333 WSGI v1.0</a>

‎pages/wsgi-server.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,12 @@ <h1>WSGI Server</h1>
5555
WSGI v1.0 is superseded by
5656
<a class="reference external" href="http://www.python.org/dev/peps/pep-3333/">PEP 3333</a>, which defines the
5757
v1.0.1 WSGI standard.</p>
58-
<hr class="docutils" />
59-
<img alt="WSGI Server &lt;-&gt; Web server &lt;-&gt; Browser" src="../img/wsgi-server-browser.png" />
58+
<img alt="WSGI Server &lt;-&gt; Web server &lt;-&gt; Browser" class="technical-diagram" src="../img/web-browser-server-wsgi.png" />
6059
<p>Requests from the browser that are not for static assets (this is specified
6160
in the web server's configuration which requests are for static assets and
6261
which are not) are passed to the WSGI server. Once the request is
63-
processed by the WSGI server, the request is passed back through the
64-
web server and onto the browser.</p>
65-
<hr class="docutils" />
62+
processed and generated by the WSGI server, the response is passed
63+
back through the web server and onto the browser.</p>
6664
<div class="section" id="wsgi-resources">
6765
<h2>WSGI Resources</h2>
6866
<p><a class="reference external" href="http://www.python.org/dev/peps/pep-0333/">PEP 0333 WSGI v1.0</a>

‎source/content/pages/wsgi-server.rst‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@ WSGI v1.0 is superseded by
1313
`PEP 3333 <http://www.python.org/dev/peps/pep-3333/>`_, which defines the
1414
v1.0.1 WSGI standard.
1515

16-
----
1716

18-
19-
.. image:: ../img/wsgi-server-browser.png
17+
.. image:: ../img/web-browser-server-wsgi.png
2018
:alt: WSGI Server <-> Web server <-> Browser
19+
:class: technical-diagram
2120

2221
Requests from the browser that are not for static assets (this is specified
2322
in the web server's configuration which requests are for static assets and
2423
which are not) are passed to the WSGI server. Once the request is
25-
processed by the WSGI server, the request is passed back through the
26-
web server and onto the browser.
24+
processed and generated by the WSGI server, the response is passed
25+
back through the web server and onto the browser.
2726

28-
----
2927

3028
WSGI Resources
3129
--------------

‎source/mockups/web-browser-server-wsgi.bmml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<mockup version="1.0" skin="wireframe" fontFace="Balsamiq Sans" measuredW="1336" measuredH="490" mockupW="1215" mockupH="398">
2+
<controls>
3+
<control controlID="1" controlTypeID="com.balsamiq.mockups::TextArea" x="478" y="93" w="200" h="397" measuredW="200" measuredH="140" zOrder="0" locked="false" isInGroup="-1">
4+
<controlProperties>
5+
<align>center</align>
6+
<backgroundAlpha>1</backgroundAlpha>
7+
<bold>true</bold>
8+
<color>15658734</color>
9+
<size>28</size>
10+
<text>%20%0A%20%0A%20%0A%20%0A%20%0AWeb%0Aserver</text>
11+
</controlProperties>
12+
</control>
13+
<control controlID="3" controlTypeID="com.balsamiq.mockups::BrowserWindow" x="979" y="92" w="357" h="398" measuredW="450" measuredH="400" zOrder="1" locked="false" isInGroup="-1">
14+
<controlProperties>
15+
<text>Full%20Stack%20Python%0Ahttp%3A//www.fullstackpython.com/</text>
16+
</controlProperties>
17+
</control>
18+
<control controlID="5" controlTypeID="com.balsamiq.mockups::Label" x="1057" y="302" w="-1" h="-1" measuredW="176" measuredH="34" zOrder="2" locked="false" isInGroup="-1">
19+
<controlProperties>
20+
<bold>true</bold>
21+
<size>28</size>
22+
<text>Web%20browser</text>
23+
</controlProperties>
24+
</control>
25+
<control controlID="6" controlTypeID="com.balsamiq.mockups::Arrow" x="678" y="141" w="301" h="10" measuredW="150" measuredH="100" zOrder="3" locked="false" isInGroup="-1">
26+
<controlProperties>
27+
<direction>top</direction>
28+
<rightArrow>false</rightArrow>
29+
<text>www.fullstackpython.com</text>
30+
</controlProperties>
31+
</control>
32+
<control controlID="7" controlTypeID="com.balsamiq.mockups::Arrow" x="678" y="291" w="301" h="10" measuredW="150" measuredH="100" zOrder="4" locked="false" isInGroup="-1">
33+
<controlProperties>
34+
<direction>top</direction>
35+
<rightArrow>false</rightArrow>
36+
<text>GET%20style.css</text>
37+
</controlProperties>
38+
</control>
39+
<control controlID="9" controlTypeID="com.balsamiq.mockups::Arrow" x="678" y="240" w="301" h="10" measuredW="150" measuredH="100" zOrder="5" locked="false" isInGroup="-1">
40+
<controlProperties>
41+
<direction>top</direction>
42+
<leftArrow>false</leftArrow>
43+
<rightArrow>true</rightArrow>
44+
<text>sends%20index.html%2C%20which%20references%20style.css</text>
45+
</controlProperties>
46+
</control>
47+
<control controlID="10" controlTypeID="com.balsamiq.mockups::Arrow" x="678" y="341" w="301" h="10" measuredW="150" measuredH="100" zOrder="6" locked="false" isInGroup="-1">
48+
<controlProperties>
49+
<direction>top</direction>
50+
<leftArrow>false</leftArrow>
51+
<rightArrow>true</rightArrow>
52+
<text>sends%20style.css</text>
53+
</controlProperties>
54+
</control>
55+
<control controlID="12" controlTypeID="com.balsamiq.mockups::TextArea" x="121" y="93" w="200" h="397" measuredW="200" measuredH="140" zOrder="7" locked="false" isInGroup="-1">
56+
<controlProperties>
57+
<align>center</align>
58+
<backgroundAlpha>1</backgroundAlpha>
59+
<bold>true</bold>
60+
<color>15658734</color>
61+
<size>28</size>
62+
<text>%20%0A%20%0A%20%0A%20%0A%20%0AWeb%0Aserver</text>
63+
</controlProperties>
64+
</control>
65+
<control controlID="13" controlTypeID="com.balsamiq.mockups::Arrow" x="321" y="177" w="157" h="10" measuredW="150" measuredH="100" zOrder="8" locked="false" isInGroup="-1">
66+
<controlProperties>
67+
<direction>top</direction>
68+
<rightArrow>false</rightArrow>
69+
<text>generate%20webpage</text>
70+
</controlProperties>
71+
</control>
72+
<control controlID="14" controlTypeID="com.balsamiq.mockups::Arrow" x="321" y="202" w="157" h="10" measuredW="150" measuredH="100" zOrder="9" locked="false" isInGroup="-1">
73+
<controlProperties>
74+
<direction>top</direction>
75+
<leftArrow>false</leftArrow>
76+
<rightArrow>true</rightArrow>
77+
<text>HTML%20page</text>
78+
</controlProperties>
79+
</control>
80+
</controls>
81+
</mockup>

‎source/theme/static/img/web-browser-server-wsgi.png‎

23.5 KB
Loading

‎theme/img/web-browser-server-wsgi.png‎

23.5 KB
Loading

0 commit comments

Comments
 (0)