Changeset 973
- Timestamp:
- 02/16/06 12:52:21
- Files:
-
- trunk/CHANGELOG.txt (modified) (2 diffs)
- trunk/cherrypy/_cphttpserver.py (deleted)
- trunk/cherrypy/test/test.py (modified) (1 diff)
- trunk/cherrypy/test/test_states.py (modified) (2 diffs)
- trunk/docs/book/xml/apireference.xml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/CHANGELOG.txt
r948 r973 1 2006-02-16: 2 * Removed _cphttpserver, the native HTTP server that was deprecated in CP 2.1 (fumanchu) 3 1 4 2006-01-27: 2 5 * CherryPy-2.2.0beta released … … 4 7 * Added cherrypy.lower_api switch (people get a speed boost if they 5 8 * set it to True) 9 10 2006-01-02: 11 * New _cptree module, with strong encouragement to call tree.mount(Root()[, baseurl]) instead of cherrypy.root = Root(). 6 12 7 13 2005-12-05: trunk/cherrypy/test/test.py
r891 r973 23 23 # The first server in the list is the default server. 24 24 available_servers = {'serverless': (0, "Serverless", None), 25 'native': (1, "Native HTTP Server", 26 "cherrypy._cphttpserver.embedded_server"), 27 'wsgi': (2, "Native WSGI Server", 25 'wsgi': (1, "Native WSGI Server", 28 26 "cherrypy.test.helper.TestWSGI"), 29 27 } trunk/cherrypy/test/test_states.py
r967 r973 199 199 _run(None) 200 200 _run("cherrypy._cpwsgi.WSGIServer") 201 _run("cherrypy._cphttpserver.PooledThreadServer")202 conf['server.thread_pool'] = 1203 _run("cherrypy._cphttpserver.CherryHTTPServer")204 201 205 202 … … 219 216 run(server, conf) 220 217 _run("cherrypy._cpwsgi.WSGIServer") 221 _run("cherrypy._cphttpserver.PooledThreadServer")222 conf['server.thread_pool'] = 1223 _run("cherrypy._cphttpserver.CherryHTTPServer")224 218 225 219 trunk/docs/book/xml/apireference.xml
r972 r973 91 91 <title>cherrypy.request.wsgi_environ</title> 92 92 <para>This attribute is a dictionary containing the WSGI environment for the request. In 93 non-WSGI settings (i.e., running under _cphttpserver), it is absent.</para>93 non-WSGI settings (i.e., custom HTTP servers), it is absent.</para> 94 94 </section> 95 95 <section> … … 204 204 (you may pass the class names as a string if you wish):</para> 205 205 <itemizedlist> 206 <listitem>207 <para><code>cherrypy._cphttpserver.CherryHTTPServer</code>: this will load the208 old, single-threaded built-in HTTP server. This server is deprecated and will209 probably be removed in CherryPy 2.2.</para>210 </listitem>211 <listitem>212 <para><code>cherrypy._cphttpserver.PooledThreadServer</code>: this will load the213 old, multi-threaded built-in HTTP server. This server is deprecated and will214 probably be removed in CherryPy 2.2.</para>215 </listitem>216 <listitem>217 <para><code>cherrypy._cphttpserver.embedded_server</code>: use this to218 automatically select between the CherryHTTPServer and the PooledThreadServer219 based on the value of config.get("server.thread_pool") and220 config.get("server.socket_file").</para>221 </listitem>222 206 <listitem> 223 207 <para><code>None</code>: this will not load any HTTP server. Note that this is

