passenger 2.2.11 → 2.2.12

data/NEWS

@@ -1,3 +1,32 @@
+Release 2.2.12
+--------------
+
+ * Improved Bundler support.
+   Previous versions might not be able to correctly load gems bundled
+   by Bundler. We've also documented how our Bundler support works and
+   how to override our support if you need special behavior.
+   Please refer to the Phusion Passenger Users Guide, section
+   "Bundler support".
+ * Worked around some user account handling bugs in Ruby. Issue #192.
+ * Fixed some Ruby 1.9 tempfile.rb compatibility problems.
+ * Fixed some compilation problems on some ARM Linux platforms.
+ * [Apache] Suppress bogus mod_xsendfile-related error messages.
+   When mod_xsendfile is being used, Phusion Passenger might print
+   bogus error messages like "EPIPE" or "Apache stopped forwarding
+   the backend's response" to the log file. These messages are
+   normal, are harmless and can be safely ignored, but they pollute
+   the log file. So in this release we've added code to suppress
+   these messages when mod_xsendfile is being used. Issue #474.
+ * [Nginx] Fixed "passenger_user_switching off" permission problems
+   If Nginx is running as root and passenger_user_switching is turned
+   off, then Phusion Passenger would fail to initialize because of
+   a permission problem. This has been fixed. Issue #458.
+ * [Nginx] Nginx >= 0.8.38 is now supported.
+   Thanks to Sergey A. Osokin for reporting the problem.
+ * [Nginx] passenger-install-nginx-module upgraded
+    It now defaults to installing Nginx 0.7.65 instead of 0.7.64.
+
+
 Release 2.2.11
 --------------
 

data/bin/passenger-install-nginx-module

@@ -36,7 +36,7 @@ include PlatformInfo
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	
-	NGINX_VERSION = "0.7.64"
+	NGINX_VERSION = "0.7.65"
 	
 	def dependencies
 		result = [

data/doc/Users guide Apache.html

@@ -3123,7 +3123,38 @@ namespace :deploy do
   end
 end</tt></pre>
 </div></div>
-<h3 id="moving_phusion_passenger">8.4. Moving Phusion Passenger to a different directory</h3><div style="clear:left"></div>
+<h3 id="bundler_support">8.4. Bundler support</h3><div style="clear:left"></div>
+<div class="paragraph"><p>Phusion Passenger has automatic support for <a href="http://gembundler.com/git.html">Bundler</a>.
+It works as follows:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+If you have a <em>.bundle/environment.rb</em> in your application root, then Phusion
+  Passenger will require that file before loading your application.
+</p>
+</li>
+<li>
+<p>
+Otherwise, if you have a <em>Gemfile</em>, then Phusion Passenger will automatically call
+  <tt>Bundler.setup()</tt> before loading your application.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>It&#8217;s possible that your application also calls <tt>Bundler.setup</tt> during loading, e.g. in
+<em>config.ru</em> or in <em>config/boot.rb</em>. This is the case with Rails 3, and is also the case if you
+modified your <em>config/boot.rb</em> according to the
+<a href="http://gembundler.com/rails23.html">Bundler Rails 2.3 instructions</a>.
+This leads to <tt>Bundler.setup</tt> being called twice, once before the application startup file
+is required and once during application startup. However this is harmless and doesn&#8217;t
+have any negative effects.</p></div>
+<div class="paragraph"><p>Phusion Passenger assumes that you&#8217;re using Bundler &gt;= 0.9.5. If you don&#8217;t want Phusion
+Passenger to run its Bundler support code, e.g. because you need to use an older version
+of Bundler with an incompatible API or because you use a system other than Bundler, then
+you can override Phusion Passenger&#8217;s Bundler support code by creating a file
+<em>config/setup_load_paths.rb</em>. If this file exists then it will be required before loading
+the application startup file. In this file you can do whatever you need to setup Bundler
+or a similar system.</p></div>
+<h3 id="moving_phusion_passenger">8.5. Moving Phusion Passenger to a different directory</h3><div style="clear:left"></div>
 <div class="paragraph"><p>It is possible to relocate the Phusion Passenger files to a different directory. It
 involves two steps:</p></div>
 <div class="olist arabic"><ol class="arabic">
@@ -3160,7 +3191,7 @@ Edit your Apache configuration file, and set:
 </div></div>
 </li>
 </ol></div>
-<h3 id="_installing_multiple_ruby_on_rails_versions">8.5. Installing multiple Ruby on Rails versions</h3><div style="clear:left"></div>
+<h3 id="_installing_multiple_ruby_on_rails_versions">8.6. Installing multiple Ruby on Rails versions</h3><div style="clear:left"></div>
 <div class="paragraph"><p>Each Ruby on Rails applications that are going to be deployed may require a
 specific Ruby on Rails version. You can install a specific version with
 this command:</p></div>
@@ -3171,7 +3202,7 @@ this command:</p></div>
 <div class="paragraph"><p>where <em>X.X.X</em> is the version number of Ruby on Rails.</p></div>
 <div class="paragraph"><p>All of these versions will exist in parallel, and will not conflict with each
 other. Phusion Passenger will automatically make use of the correct version.</p></div>
-<h3 id="_making_the_application_restart_after_each_request">8.6. Making the application restart after each request</h3><div style="clear:left"></div>
+<h3 id="_making_the_application_restart_after_each_request">8.7. Making the application restart after each request</h3><div style="clear:left"></div>
 <div class="paragraph"><p>In some situations it might be desirable to restart the web application after
 each request, for example when developing a non-Rails application that doesn&#8217;t
 support code reloading, or when developing a web framework.</p></div>
@@ -3192,7 +3223,7 @@ or when you&#8217;re not developing a Rails application and your web framework
 does not support code reloading.</td>
 </tr></table>
 </div>
-<h3 id="sub_uri_deployment_uri_fix">8.7. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments</h3><div style="clear:left"></div>
+<h3 id="sub_uri_deployment_uri_fix">8.8. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments</h3><div style="clear:left"></div>
 <div class="paragraph"><p>Some people experience broken images and other broken static assets when they
 deploy their application to a sub-URI (i.e. <em>http://mysite.com/railsapp/</em>).
 The reason for this usually is that you used a
@@ -3227,10 +3258,10 @@ so that your images will always work no matter what sub-URI you&#8217;ve deploye
 append a timestamp to the URI to better facilitate HTTP caching. For more information,
 please refer to
 <a href="http://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html">the Rails API docs</a>.</p></div>
-<h3 id="_x_sendfile_support">8.8. X-Sendfile support</h3><div style="clear:left"></div>
+<h3 id="_x_sendfile_support">8.9. X-Sendfile support</h3><div style="clear:left"></div>
 <div class="paragraph"><p>Phusion Passenger does not provide X-Sendfile support by itself. Please install
 <a href="http://tn123.ath.cx/mod_xsendfile/">mod_xsendfile</a> for X-Sendfile support.</p></div>
-<h3 id="_upload_progress">8.9. Upload progress</h3><div style="clear:left"></div>
+<h3 id="_upload_progress">8.10. Upload progress</h3><div style="clear:left"></div>
 <div class="paragraph"><p>Phusion Passenger does not provide upload progress support by itself. Please
 try drogus&#8217;s <a href="http://github.com/drogus/apache-upload-progress-module/tree/master">
 Apache upload progress module</a> instead.</p></div>
@@ -3718,7 +3749,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-03-05 10:35:16 CEST
+Last updated 2010-05-31 21:19:11 CEST
 </div>
 </div>
 </body>

data/doc/Users guide Nginx.html

@@ -1909,7 +1909,38 @@ namespace :deploy do
   end
 end</tt></pre>
 </div></div>
-<h3 id="moving_phusion_passenger">7.4. Moving Phusion Passenger to a different directory</h3><div style="clear:left"></div>
+<h3 id="bundler_support">7.4. Bundler support</h3><div style="clear:left"></div>
+<div class="paragraph"><p>Phusion Passenger has automatic support for <a href="http://gembundler.com/git.html">Bundler</a>.
+It works as follows:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+If you have a <em>.bundle/environment.rb</em> in your application root, then Phusion
+  Passenger will require that file before loading your application.
+</p>
+</li>
+<li>
+<p>
+Otherwise, if you have a <em>Gemfile</em>, then Phusion Passenger will automatically call
+  <tt>Bundler.setup()</tt> before loading your application.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>It&#8217;s possible that your application also calls <tt>Bundler.setup</tt> during loading, e.g. in
+<em>config.ru</em> or in <em>config/boot.rb</em>. This is the case with Rails 3, and is also the case if you
+modified your <em>config/boot.rb</em> according to the
+<a href="http://gembundler.com/rails23.html">Bundler Rails 2.3 instructions</a>.
+This leads to <tt>Bundler.setup</tt> being called twice, once before the application startup file
+is required and once during application startup. However this is harmless and doesn&#8217;t
+have any negative effects.</p></div>
+<div class="paragraph"><p>Phusion Passenger assumes that you&#8217;re using Bundler &gt;= 0.9.5. If you don&#8217;t want Phusion
+Passenger to run its Bundler support code, e.g. because you need to use an older version
+of Bundler with an incompatible API or because you use a system other than Bundler, then
+you can override Phusion Passenger&#8217;s Bundler support code by creating a file
+<em>config/setup_load_paths.rb</em>. If this file exists then it will be required before loading
+the application startup file. In this file you can do whatever you need to setup Bundler
+or a similar system.</p></div>
+<h3 id="moving_phusion_passenger">7.5. Moving Phusion Passenger to a different directory</h3><div style="clear:left"></div>
 <div class="paragraph"><p>It is possible to relocate the Phusion Passenger files to a different directory. It
 involves two steps:</p></div>
 <div class="olist arabic"><ol class="arabic">
@@ -1946,7 +1977,7 @@ Edit your Apache configuration file, and set:
 </div></div>
 </li>
 </ol></div>
-<h3 id="_installing_multiple_ruby_on_rails_versions">7.5. Installing multiple Ruby on Rails versions</h3><div style="clear:left"></div>
+<h3 id="_installing_multiple_ruby_on_rails_versions">7.6. Installing multiple Ruby on Rails versions</h3><div style="clear:left"></div>
 <div class="paragraph"><p>Each Ruby on Rails applications that are going to be deployed may require a
 specific Ruby on Rails version. You can install a specific version with
 this command:</p></div>
@@ -1957,7 +1988,7 @@ this command:</p></div>
 <div class="paragraph"><p>where <em>X.X.X</em> is the version number of Ruby on Rails.</p></div>
 <div class="paragraph"><p>All of these versions will exist in parallel, and will not conflict with each
 other. Phusion Passenger will automatically make use of the correct version.</p></div>
-<h3 id="_making_the_application_restart_after_each_request">7.6. Making the application restart after each request</h3><div style="clear:left"></div>
+<h3 id="_making_the_application_restart_after_each_request">7.7. Making the application restart after each request</h3><div style="clear:left"></div>
 <div class="paragraph"><p>In some situations it might be desirable to restart the web application after
 each request, for example when developing a non-Rails application that doesn&#8217;t
 support code reloading, or when developing a web framework.</p></div>
@@ -1978,7 +2009,7 @@ or when you&#8217;re not developing a Rails application and your web framework
 does not support code reloading.</td>
 </tr></table>
 </div>
-<h3 id="sub_uri_deployment_uri_fix">7.7. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments</h3><div style="clear:left"></div>
+<h3 id="sub_uri_deployment_uri_fix">7.8. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments</h3><div style="clear:left"></div>
 <div class="paragraph"><p>Some people experience broken images and other broken static assets when they
 deploy their application to a sub-URI (i.e. <em>http://mysite.com/railsapp/</em>).
 The reason for this usually is that you used a
@@ -2396,7 +2427,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-03-05 10:35:16 CEST
+Last updated 2010-05-31 21:19:11 CEST
 </div>
 </div>
 </body>

data/doc/cxxapi/AbstractSpawnManager_8h-source.html

@@ -131,7 +131,7 @@
 <a name="l00109"></a>00109 
 <a name="l00110"></a>00110 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_ABSTRACT_SPAWN_MANAGER_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:55 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/Account_8h-source.html

@@ -195,7 +195,7 @@
 <a name="l00173"></a>00173 
 <a name="l00174"></a>00174 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_ACCOUNT_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/AccountsDatabase_8h-source.html

@@ -151,7 +151,7 @@
 <a name="l00129"></a>00129 
 <a name="l00130"></a>00130 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_ACCOUNTS_DATABASE_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/AgentsStarter_8h-source.html

@@ -72,7 +72,7 @@
 <a name="l00050"></a>00050 <span class="preprocessor"></span>
 <a name="l00051"></a>00051 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_AGENTS_STARTER_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/BCrypt_8h-source.html

@@ -94,7 +94,7 @@
 <a name="l00072"></a>00072 
 <a name="l00073"></a>00073 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_BCRYPT_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/Blowfish_8h-source.html

@@ -124,7 +124,7 @@
 <a name="l00102"></a>00102 
 <a name="l00103"></a>00103 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_BLOWFISH_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/Bucket_8h-source.html

@@ -10,6 +10,7 @@
     <ul>
       <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
       <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="namespaces.html"><span>Namespaces</span></a></li>
       <li><a href="annotated.html"><span>Classes</span></a></li>
       <li class="current"><a href="files.html"><span>Files</span></a></li>
     </ul>
@@ -21,7 +22,7 @@
   </div>
 <h1>Bucket.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
 <a name="l00002"></a>00002 <span class="comment"> *  Phusion Passenger - http://www.modrails.com/</span>
-<a name="l00003"></a>00003 <span class="comment"> *  Copyright (c) 2008, 2009 Phusion</span>
+<a name="l00003"></a>00003 <span class="comment"> *  Copyright (c) 2010 Phusion</span>
 <a name="l00004"></a>00004 <span class="comment"> *</span>
 <a name="l00005"></a>00005 <span class="comment"> *  "Phusion Passenger" is a trademark of Hongli Lai &amp; Ninh Bui.</span>
 <a name="l00006"></a>00006 <span class="comment"> *</span>
@@ -48,7 +49,7 @@
 <a name="l00027"></a>00027 <span class="preprocessor"></span>
 <a name="l00028"></a>00028 <span class="preprocessor">#include &lt;boost/shared_ptr.hpp&gt;</span>
 <a name="l00029"></a>00029 <span class="preprocessor">#include &lt;apr_buckets.h&gt;</span>
-<a name="l00030"></a>00030 <span class="preprocessor">#include "Application.h"</span>
+<a name="l00030"></a>00030 <span class="preprocessor">#include "Session.h"</span>
 <a name="l00031"></a>00031 
 <a name="l00032"></a>00032 <span class="keyword">namespace </span>Passenger {
 <a name="l00033"></a>00033 
@@ -99,7 +100,7 @@
 <a name="l00078"></a>00078 <span class="comment"> *   strange I/O problems.</span>
 <a name="l00079"></a>00079 <span class="comment"> * - It can store its current state in a PassengerBucketState data structure.</span>
 <a name="l00080"></a>00080 <span class="comment"> */</span>
-<a name="l00081"></a>00081 apr_bucket *passenger_bucket_create(Passenger::Application::SessionPtr session,
+<a name="l00081"></a>00081 apr_bucket *<a class="code" href="namespacePassenger.html#35b11c8ce90e90d01380f182d82f8cac" title="We used to use an apr_bucket_pipe for forwarding the backend process&amp;#39;s response...">passenger_bucket_create</a>(SessionPtr session,
 <a name="l00082"></a>00082                                     PassengerBucketStatePtr state,
 <a name="l00083"></a>00083                                     apr_bucket_alloc_t *list);
 <a name="l00084"></a>00084 
@@ -107,7 +108,7 @@
 <a name="l00086"></a>00086 
 <a name="l00087"></a>00087 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_BUCKET_H_ */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Fri Mar 5 11:13:03 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/Constants_8h-source.html

@@ -48,7 +48,7 @@
 <a name="l00026"></a>00026 <span class="preprocessor"></span><span class="preprocessor">#define _PASSENGER_CONSTANTS_H_</span>
 <a name="l00027"></a>00027 <span class="preprocessor"></span>
 <a name="l00028"></a>00028 <span class="comment">/* Don't forget to update lib/phusion_passenger.rb too. */</span>
-<a name="l00029"></a>00029 <span class="preprocessor">#define PASSENGER_VERSION "2.9.1"</span>
+<a name="l00029"></a>00029 <span class="preprocessor">#define PASSENGER_VERSION "2.9.2"</span>
 <a name="l00030"></a>00030 <span class="preprocessor"></span>
 <a name="l00031"></a>00031 <span class="preprocessor">#define DEFAULT_LOG_LEVEL 0</span>
 <a name="l00032"></a>00032 <span class="preprocessor"></span><span class="preprocessor">#define DEFAULT_MAX_POOL_SIZE 6</span>
@@ -64,7 +64,7 @@
 <a name="l00042"></a>00042 <span class="preprocessor"></span>
 <a name="l00043"></a>00043 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_CONSTANTS_H */</span>
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/ContentHandler_8h-source.html

@@ -85,7 +85,7 @@
 <a name="l00063"></a>00063 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_NGINX_CONTENT_HANDLER_H_ */</span>
 <a name="l00064"></a>00064 
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Feb 21 12:22:45 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/DirectoryMapper_8h-source.html

@@ -10,6 +10,7 @@
     <ul>
       <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
       <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="namespaces.html"><span>Namespaces</span></a></li>
       <li><a href="annotated.html"><span>Classes</span></a></li>
       <li class="current"><a href="files.html"><span>Files</span></a></li>
     </ul>
@@ -21,7 +22,7 @@
   </div>
 <h1>DirectoryMapper.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span>
 <a name="l00002"></a>00002 <span class="comment"> *  Phusion Passenger - http://www.modrails.com/</span>
-<a name="l00003"></a>00003 <span class="comment"> *  Copyright (c) 2008, 2009 Phusion</span>
+<a name="l00003"></a>00003 <span class="comment"> *  Copyright (c) 2010 Phusion</span>
 <a name="l00004"></a>00004 <span class="comment"> *</span>
 <a name="l00005"></a>00005 <span class="comment"> *  "Phusion Passenger" is a trademark of Hongli Lai &amp; Ninh Bui.</span>
 <a name="l00006"></a>00006 <span class="comment"> *</span>
@@ -52,9 +53,9 @@
 <a name="l00031"></a>00031 
 <a name="l00032"></a>00032 <span class="preprocessor">#include &lt;oxt/backtrace.hpp&gt;</span>
 <a name="l00033"></a>00033 
-<a name="l00034"></a>00034 <span class="preprocessor">#include "CachedFileStat.hpp"</span>
-<a name="l00035"></a>00035 <span class="preprocessor">#include "Configuration.h"</span>
-<a name="l00036"></a>00036 <span class="preprocessor">#include "Utils.h"</span>
+<a name="l00034"></a>00034 <span class="preprocessor">#include "Configuration.hpp"</span>
+<a name="l00035"></a>00035 <span class="preprocessor">#include "Utils.h"</span>
+<a name="l00036"></a>00036 <span class="preprocessor">#include "Utils/CachedFileStat.hpp"</span>
 <a name="l00037"></a>00037 
 <a name="l00038"></a>00038 <span class="comment">// The Apache/APR headers *must* come after the Boost headers, otherwise</span>
 <a name="l00039"></a>00039 <span class="comment">// compilation will fail on OpenBSD.</span>
@@ -192,7 +193,7 @@
 <a name="l00171"></a>00171                 
 <a name="l00172"></a>00172                 UPDATE_TRACE_POINT();
 <a name="l00173"></a>00173                 <span class="keywordflow">if</span> (shouldAutoDetectRack()
-<a name="l00174"></a>00174                  &amp;&amp; verifyRackDir(config-&gt;getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
+<a name="l00174"></a>00174                  &amp;&amp; <a class="code" href="group__Support.html#g53969f8e3ee68d1d99ffe75af8db9be8" title="Check whether the specified directory is a valid Rack application root directory...">verifyRackDir</a>(config-&gt;getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
 <a name="l00175"></a>00175                         baseURIKnown = <span class="keyword">true</span>;
 <a name="l00176"></a>00176                         baseURI = <span class="stringliteral">"/"</span>;
 <a name="l00177"></a>00177                         appType = RACK;
@@ -201,7 +202,7 @@
 <a name="l00180"></a>00180                 
 <a name="l00181"></a>00181                 UPDATE_TRACE_POINT();
 <a name="l00182"></a>00182                 <span class="keywordflow">if</span> (shouldAutoDetectRails()
-<a name="l00183"></a>00183                  &amp;&amp; verifyRailsDir(config-&gt;getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
+<a name="l00183"></a>00183                  &amp;&amp; <a class="code" href="group__Support.html#g5e6bc7ff22b7c61238d7913521936f71" title="Check whether the specified directory is a valid Ruby on Rails application root directory...">verifyRailsDir</a>(config-&gt;getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
 <a name="l00184"></a>00184                         baseURIKnown = <span class="keyword">true</span>;
 <a name="l00185"></a>00185                         baseURI = <span class="stringliteral">"/"</span>;
 <a name="l00186"></a>00186                         appType = RAILS;
@@ -210,7 +211,7 @@
 <a name="l00189"></a>00189                 
 <a name="l00190"></a>00190                 UPDATE_TRACE_POINT();
 <a name="l00191"></a>00191                 <span class="keywordflow">if</span> (shouldAutoDetectWSGI()
-<a name="l00192"></a>00192                  &amp;&amp; verifyWSGIDir(config-&gt;getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
+<a name="l00192"></a>00192                  &amp;&amp; <a class="code" href="group__Support.html#gaec51d2912999d611994c49341f36247" title="Check whether the specified directory is a valid WSGI application root directory...">verifyWSGIDir</a>(config-&gt;getAppRoot(ap_document_root(r)), cstat, throttleRate)) {
 <a name="l00193"></a>00193                         baseURIKnown = <span class="keyword">true</span>;
 <a name="l00194"></a>00194                         baseURI = <span class="stringliteral">"/"</span>;
 <a name="l00195"></a>00195                         appType = WSGI;
@@ -252,7 +253,7 @@
 <a name="l00231"></a>00231 <span class="comment">                                 * This is probably a symlink, so let's resolve it.</span>
 <a name="l00232"></a>00232 <span class="comment">                                 */</span>
 <a name="l00233"></a>00233                                 path.append(baseURI);
-<a name="l00234"></a>00234                                 path = resolveSymlink(path);
+<a name="l00234"></a>00234                                 path = <a class="code" href="group__Support.html#gc3d2b3d608188527d888e63d22c5163c" title="If path refers to a symlink, then this function resolves the symlink for 1 level...">resolveSymlink</a>(path);
 <a name="l00235"></a>00235                         }
 <a name="l00236"></a>00236                         <span class="keywordflow">return</span> path;
 <a name="l00237"></a>00237                 } <span class="keywordflow">else</span> {
@@ -316,7 +317,7 @@
 <a name="l00295"></a>00295 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_DIRECTORY_MAPPER_H_ */</span>
 <a name="l00296"></a>00296 
 </pre></div></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Fri Mar 5 11:13:03 2010 for Passenger by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>

data/doc/cxxapi/EventedServer_8h-source.html

@@ -0,0 +1,415 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>Passenger: EventedServer.h Source File</title>
+<link href="tabs.css" rel="stylesheet" type="text/css">
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.8 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="main.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="namespaces.html"><span>Namespaces</span></a></li>
+      <li><a href="annotated.html"><span>Classes</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    </ul>
+  </div>
+<h1>EventedServer.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef _PASSENGER_EVENTED_SERVER_H_</span>
+<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define _PASSENGER_EVENTED_SERVER_H_</span>
+<a name="l00003"></a>00003 <span class="preprocessor"></span>
+<a name="l00004"></a>00004 <span class="preprocessor">#include &lt;ev++.h&gt;</span>
+<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;boost/shared_ptr.hpp&gt;</span>
+<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;boost/enable_shared_from_this.hpp&gt;</span>
+<a name="l00007"></a>00007 <span class="preprocessor">#include &lt;oxt/system_calls.hpp&gt;</span>
+<a name="l00008"></a>00008 <span class="preprocessor">#include &lt;oxt/macros.hpp&gt;</span>
+<a name="l00009"></a>00009 <span class="preprocessor">#include &lt;algorithm&gt;</span>
+<a name="l00010"></a>00010 <span class="preprocessor">#include &lt;string&gt;</span>
+<a name="l00011"></a>00011 <span class="preprocessor">#include &lt;set&gt;</span>
+<a name="l00012"></a>00012 <span class="preprocessor">#include &lt;sys/types.h&gt;</span>
+<a name="l00013"></a>00013 <span class="preprocessor">#include &lt;sys/un.h&gt;</span>
+<a name="l00014"></a>00014 <span class="preprocessor">#include &lt;sys/uio.h&gt;</span>
+<a name="l00015"></a>00015 <span class="preprocessor">#include &lt;netinet/in.h&gt;</span>
+<a name="l00016"></a>00016 <span class="preprocessor">#include &lt;unistd.h&gt;</span>
+<a name="l00017"></a>00017 <span class="preprocessor">#include "MessageReadersWriters.h"</span>
+<a name="l00018"></a>00018 <span class="preprocessor">#include "FileDescriptor.h"</span>
+<a name="l00019"></a>00019 <span class="preprocessor">#include "StaticString.h"</span>
+<a name="l00020"></a>00020 <span class="preprocessor">#include "Utils.h"</span>
+<a name="l00021"></a>00021 
+<a name="l00022"></a>00022 <span class="keyword">namespace </span>Passenger {
+<a name="l00023"></a>00023 
+<a name="l00024"></a>00024 <span class="keyword">using namespace </span>std;
+<a name="l00025"></a>00025 <span class="keyword">using namespace </span>boost;
+<a name="l00026"></a>00026 <span class="keyword">using namespace </span>oxt;
+<a name="l00027"></a>00027 
+<a name="l00028"></a>00028 <span class="keyword">class </span>EventedServer {
+<a name="l00029"></a>00029 <span class="keyword">protected</span>:
+<a name="l00030"></a>00030         <span class="keyword">struct </span><a class="code" href="classClient.html" title="A representation of a Client from the Server&amp;#39;s point of view.">Client</a>: <span class="keyword">public</span> enable_shared_from_this&lt;Client&gt; {
+<a name="l00031"></a>00031                 <span class="keyword">enum</span> {
+<a name="l00032"></a>00032                         ES_CONNECTED,
+<a name="l00033"></a>00033                         ES_WRITES_PENDING,
+<a name="l00034"></a>00034                         ES_DISCONNECTING_WITH_WRITES_PENDING,
+<a name="l00035"></a>00035                         ES_DISCONNECTED
+<a name="l00036"></a>00036                 } state;
+<a name="l00037"></a>00037                 
+<a name="l00038"></a>00038                 EventedServer *server;
+<a name="l00039"></a>00039                 FileDescriptor fd;
+<a name="l00040"></a>00040                 ev::io readWatcher;
+<a name="l00041"></a>00041                 ev::io writeWatcher;
+<a name="l00042"></a>00042                 <span class="keywordtype">bool</span> readWatcherStarted;
+<a name="l00043"></a>00043                 <span class="keywordtype">bool</span> writeWatcherStarted;
+<a name="l00044"></a>00044                 <span class="keywordtype">string</span> outbox;
+<a name="l00045"></a>00045                 
+<a name="l00046"></a>00046                 <a class="code" href="classClient.html" title="A representation of a Client from the Server&amp;#39;s point of view.">Client</a>(EventedServer *_server)
+<a name="l00047"></a>00047                         : server(_server),
+<a name="l00048"></a>00048                           readWatcher(_server-&gt;loop),
+<a name="l00049"></a>00049                           writeWatcher(_server-&gt;loop)
+<a name="l00050"></a>00050                 { }
+<a name="l00051"></a>00051                 
+<a name="l00052"></a>00052                 <span class="keywordtype">void</span> _onReadable(ev::io &amp;w, <span class="keywordtype">int</span> revents) {
+<a name="l00053"></a>00053                         server-&gt;onClientReadable(shared_from_this());
+<a name="l00054"></a>00054                 }
+<a name="l00055"></a>00055                 
+<a name="l00056"></a>00056                 <span class="keywordtype">void</span> _onWritable(ev::io &amp;w, <span class="keywordtype">int</span> revents) {
+<a name="l00057"></a>00057                         server-&gt;onClientWritable(shared_from_this());
+<a name="l00058"></a>00058                 }
+<a name="l00059"></a>00059         };
+<a name="l00060"></a>00060         
+<a name="l00061"></a>00061         <span class="keyword">typedef</span> shared_ptr&lt;Client&gt; ClientPtr;
+<a name="l00062"></a>00062         
+<a name="l00063"></a>00063         <span class="keywordtype">void</span> write(<span class="keyword">const</span> ClientPtr &amp;client, <span class="keyword">const</span> <span class="keywordtype">char</span> *data) {
+<a name="l00064"></a>00064                 write(client, StaticString(data));
+<a name="l00065"></a>00065         }
+<a name="l00066"></a>00066         
+<a name="l00067"></a>00067         <span class="keywordtype">void</span> write(<span class="keyword">const</span> ClientPtr &amp;client, <span class="keyword">const</span> StaticString &amp;data) {
+<a name="l00068"></a>00068                 write(client, &amp;data, 1);
+<a name="l00069"></a>00069         }
+<a name="l00070"></a>00070         
+<a name="l00071"></a>00071         <span class="keyword">virtual</span> <span class="keywordtype">void</span> write(<span class="keyword">const</span> ClientPtr &amp;client, <span class="keyword">const</span> StaticString data[], <span class="keywordtype">size_t</span> count) {
+<a name="l00072"></a>00072                 <span class="keywordflow">if</span> (client-&gt;state == Client::ES_DISCONNECTED) {
+<a name="l00073"></a>00073                         <span class="keywordflow">return</span>;
+<a name="l00074"></a>00074                 }
+<a name="l00075"></a>00075                 
+<a name="l00076"></a>00076                 ssize_t ret;
+<a name="l00077"></a>00077                 <span class="keywordtype">size_t</span> totalSize;
+<a name="l00078"></a>00078                 this_thread::disable_syscall_interruption dsi;
+<a name="l00079"></a>00079                 
+<a name="l00080"></a>00080                 <span class="keywordflow">if</span> (client-&gt;outbox.empty()) {
+<a name="l00081"></a>00081                         <span class="keyword">struct </span>iovec iov[count];
+<a name="l00082"></a>00082                         
+<a name="l00083"></a>00083                         totalSize = staticStringArrayToIoVec(data, count, iov);
+<a name="l00084"></a>00084                         ret = syscalls::writev(client-&gt;fd, iov, count);
+<a name="l00085"></a>00085                         <span class="keywordflow">if</span> (ret == -1) {
+<a name="l00086"></a>00086                                 <span class="keywordflow">if</span> (errno == EAGAIN) {
+<a name="l00087"></a>00087                                         <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; count; i++) {
+<a name="l00088"></a>00088                                                 client-&gt;outbox.append(data[i].data(), data[i].size());
+<a name="l00089"></a>00089                                         }
+<a name="l00090"></a>00090                                 } <span class="keywordflow">else</span> {
+<a name="l00091"></a>00091                                         printf(<span class="stringliteral">"write error\n"</span>);
+<a name="l00092"></a>00092                                 }
+<a name="l00093"></a>00093                         } <span class="keywordflow">else</span> <span class="keywordflow">if</span> ((<span class="keywordtype">size_t</span>) ret &lt; totalSize) {
+<a name="l00094"></a>00094                                 <span class="keywordtype">size_t</span> index, offset;
+<a name="l00095"></a>00095                                 
+<a name="l00096"></a>00096                                 findEndOfDataInVectors(iov, count + 1, ret, &amp;index, &amp;offset);
+<a name="l00097"></a>00097                                 <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = index; i &lt; count; i++) {
+<a name="l00098"></a>00098                                         <span class="keywordflow">if</span> (i == index) {
+<a name="l00099"></a>00099                                                 client-&gt;outbox.append(data[i].data() + offset,
+<a name="l00100"></a>00100                                                         data[i].size() - offset);
+<a name="l00101"></a>00101                                         } <span class="keywordflow">else</span> {
+<a name="l00102"></a>00102                                                 client-&gt;outbox.append(data[i].data(),
+<a name="l00103"></a>00103                                                         data[i].size());
+<a name="l00104"></a>00104                                         }
+<a name="l00105"></a>00105                                 }
+<a name="l00106"></a>00106                         }
+<a name="l00107"></a>00107                 } <span class="keywordflow">else</span> {
+<a name="l00108"></a>00108                         <span class="keyword">struct </span>iovec iov[count + 1];
+<a name="l00109"></a>00109                         
+<a name="l00110"></a>00110                         iov[0].iov_base = (<span class="keywordtype">char</span> *) client-&gt;outbox.data();
+<a name="l00111"></a>00111                         iov[0].iov_len  = client-&gt;outbox.size();
+<a name="l00112"></a>00112                         totalSize = staticStringArrayToIoVec(data, count, iov + 1);
+<a name="l00113"></a>00113                         
+<a name="l00114"></a>00114                         ret = syscalls::writev(client-&gt;fd, iov, count + 1);
+<a name="l00115"></a>00115                         <span class="keywordflow">if</span> (ret == -1) {
+<a name="l00116"></a>00116                                 <span class="keywordflow">if</span> (errno != EAGAIN) {
+<a name="l00117"></a>00117                                         printf(<span class="stringliteral">"write error\n"</span>);
+<a name="l00118"></a>00118                                 }
+<a name="l00119"></a>00119                                 <span class="comment">// else: wait until next writable event.</span>
+<a name="l00120"></a>00120                         } <span class="keywordflow">else</span> {
+<a name="l00121"></a>00121                                 string::size_type outboxSize = client-&gt;outbox.size();
+<a name="l00122"></a>00122                                 <span class="keywordtype">size_t</span> outboxSent = std::min((<span class="keywordtype">size_t</span>) ret, outboxSize);
+<a name="l00123"></a>00123                                 
+<a name="l00124"></a>00124                                 client-&gt;outbox.erase(0, outboxSent);
+<a name="l00125"></a>00125                                 <span class="keywordflow">if</span> (client-&gt;outbox.empty()) {
+<a name="l00126"></a>00126                                         <span class="keywordtype">size_t</span> index, offset;
+<a name="l00127"></a>00127                                         
+<a name="l00128"></a>00128                                         findEndOfDataInVectors(iov, count + 1, ret, &amp;index, &amp;offset);
+<a name="l00129"></a>00129                                         <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = index; i &lt; count + 1; i++) {
+<a name="l00130"></a>00130                                                 <span class="keywordflow">if</span> (i == index) {
+<a name="l00131"></a>00131                                                         client-&gt;outbox.append(
+<a name="l00132"></a>00132                                                                 data[i - 1].data() + offset,
+<a name="l00133"></a>00133                                                                 data[i - 1].size() - offset);
+<a name="l00134"></a>00134                                                 } <span class="keywordflow">else</span> {
+<a name="l00135"></a>00135                                                         client-&gt;outbox.append(
+<a name="l00136"></a>00136                                                                 data[i - 1].data(),
+<a name="l00137"></a>00137                                                                 data[i - 1].size());
+<a name="l00138"></a>00138                                                 }
+<a name="l00139"></a>00139                                         }
+<a name="l00140"></a>00140                                 } <span class="keywordflow">else</span> {
+<a name="l00141"></a>00141                                         <span class="comment">// the outbox could only be partially written, so nothing</span>
+<a name="l00142"></a>00142                                         <span class="comment">// in 'data' could be written. add everything in 'data'</span>
+<a name="l00143"></a>00143                                         <span class="comment">// into the outbox...</span>
+<a name="l00144"></a>00144                                         <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 1; i &lt; count + 1; i++) {
+<a name="l00145"></a>00145                                                 client-&gt;outbox.append(data[i - 1].data(),
+<a name="l00146"></a>00146                                                         data[i - 1].size());
+<a name="l00147"></a>00147                                         }
+<a name="l00148"></a>00148                                 }
+<a name="l00149"></a>00149                         }
+<a name="l00150"></a>00150                 }
+<a name="l00151"></a>00151                 <span class="keywordflow">if</span> (client-&gt;outbox.empty()) {
+<a name="l00152"></a>00152                         outboxFlushed(client);
+<a name="l00153"></a>00153                 } <span class="keywordflow">else</span> {
+<a name="l00154"></a>00154                         outboxNotFlushed(client);
+<a name="l00155"></a>00155                 }
+<a name="l00156"></a>00156         }
+<a name="l00157"></a>00157         <span class="comment"></span>
+<a name="l00158"></a>00158 <span class="comment">        /**</span>
+<a name="l00159"></a>00159 <span class="comment">         * Disconnects the client. If &lt;em&gt;force&lt;/em&gt; is true then the client will</span>
+<a name="l00160"></a>00160 <span class="comment">         * be disconnected immediately, and any pending outgoing data will be</span>
+<a name="l00161"></a>00161 <span class="comment">         * discarded. Otherwise the client will be disconnected after all pending</span>
+<a name="l00162"></a>00162 <span class="comment">         * outgoing data have been sent; in the mean time no new data can be</span>
+<a name="l00163"></a>00163 <span class="comment">         * received from the client.</span>
+<a name="l00164"></a>00164 <span class="comment">         */</span>
+<a name="l00165"></a>00165         <span class="keyword">virtual</span> <span class="keywordtype">void</span> disconnect(<span class="keyword">const</span> ClientPtr &amp;client, <span class="keywordtype">bool</span> force = <span class="keyword">false</span>) {
+<a name="l00166"></a>00166                 <span class="keywordflow">if</span> (client-&gt;state == Client::ES_CONNECTED
+<a name="l00167"></a>00167                  || (force &amp;&amp; client-&gt;state != Client::ES_DISCONNECTED)) {
+<a name="l00168"></a>00168                         watchReadEvents(client, <span class="keyword">false</span>);
+<a name="l00169"></a>00169                         watchWriteEvents(client, <span class="keyword">false</span>);
+<a name="l00170"></a>00170                         client-&gt;fd.close();
+<a name="l00171"></a>00171                         client-&gt;state = Client::ES_DISCONNECTED;
+<a name="l00172"></a>00172                         clients.erase(client);
+<a name="l00173"></a>00173                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (client-&gt;state == Client::ES_WRITES_PENDING) {
+<a name="l00174"></a>00174                         watchReadEvents(client, <span class="keyword">false</span>);
+<a name="l00175"></a>00175                         watchWriteEvents(client, <span class="keyword">true</span>);
+<a name="l00176"></a>00176                         shutdown(client-&gt;fd, SHUT_RD);
+<a name="l00177"></a>00177                         client-&gt;state = Client::ES_DISCONNECTING_WITH_WRITES_PENDING;
+<a name="l00178"></a>00178                 }
+<a name="l00179"></a>00179         }
+<a name="l00180"></a>00180         
+<a name="l00181"></a>00181         <span class="keyword">virtual</span> ClientPtr createClient() {
+<a name="l00182"></a>00182                 <span class="keywordflow">return</span> ClientPtr(<span class="keyword">new</span> <a class="code" href="classClient.html" title="A representation of a Client from the Server&amp;#39;s point of view.">Client</a>(<span class="keyword">this</span>));
+<a name="l00183"></a>00183         }
+<a name="l00184"></a>00184         
+<a name="l00185"></a>00185         <span class="keyword">virtual</span> <span class="keywordtype">void</span> onNewClient(<span class="keyword">const</span> ClientPtr &amp;client) { }
+<a name="l00186"></a>00186         <span class="keyword">virtual</span> <span class="keywordtype">void</span> onClientReadable(<span class="keyword">const</span> ClientPtr &amp;client) { }
+<a name="l00187"></a>00187 
+<a name="l00188"></a>00188 <span class="keyword">private</span>:
+<a name="l00189"></a>00189         <span class="keyword">struct </span>ev_loop *loop;
+<a name="l00190"></a>00190         FileDescriptor fd;
+<a name="l00191"></a>00191         ev::io acceptWatcher;
+<a name="l00192"></a>00192         set&lt;ClientPtr&gt; clients;
+<a name="l00193"></a>00193         
+<a name="l00194"></a>00194         <span class="keywordtype">size_t</span> staticStringArrayToIoVec(<span class="keyword">const</span> StaticString ary[], <span class="keywordtype">size_t</span> count, <span class="keyword">struct</span> iovec *vec) {
+<a name="l00195"></a>00195                 <span class="keywordtype">size_t</span> total = 0;
+<a name="l00196"></a>00196                 <span class="keywordflow">for</span> (<span class="keywordtype">size_t</span> i = 0; i &lt; count; i++) {
+<a name="l00197"></a>00197                         vec[i].iov_base = (<span class="keywordtype">char</span> *) ary[i].data();
+<a name="l00198"></a>00198                         vec[i].iov_len  = ary[i].size();
+<a name="l00199"></a>00199                         total += ary[i].size();
+<a name="l00200"></a>00200                 }
+<a name="l00201"></a>00201                 <span class="keywordflow">return</span> total;
+<a name="l00202"></a>00202         }
+<a name="l00203"></a>00203         
+<a name="l00204"></a>00204         <span class="keywordtype">void</span> findEndOfDataInVectors(<span class="keyword">struct</span> iovec iov[], <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> dataSize,
+<a name="l00205"></a>00205                 <span class="keywordtype">size_t</span> *index, <span class="keywordtype">size_t</span> *offset)
+<a name="l00206"></a>00206         {
+<a name="l00207"></a>00207                 <span class="keywordtype">size_t</span> i, begin;
+<a name="l00208"></a>00208                 
+<a name="l00209"></a>00209                 begin = 0;
+<a name="l00210"></a>00210                 <span class="keywordflow">for</span> (i = 0; OXT_LIKELY(i &lt; count); i++) {
+<a name="l00211"></a>00211                         <span class="keywordtype">size_t</span> end = begin + iov[i].iov_len;
+<a name="l00212"></a>00212                         <span class="keywordflow">if</span> (OXT_LIKELY(begin &lt;= dataSize)) {
+<a name="l00213"></a>00213                                 <span class="keywordflow">if</span> (dataSize &lt; end) {
+<a name="l00214"></a>00214                                         *index = i;
+<a name="l00215"></a>00215                                         *offset = dataSize - begin;
+<a name="l00216"></a>00216                                         <span class="keywordflow">return</span>;
+<a name="l00217"></a>00217                                 } <span class="keywordflow">else</span> {
+<a name="l00218"></a>00218                                         begin = end;
+<a name="l00219"></a>00219                                 }
+<a name="l00220"></a>00220                         } <span class="keywordflow">else</span> {
+<a name="l00221"></a>00221                                 <span class="comment">// Never reached.</span>
+<a name="l00222"></a>00222                                 abort();
+<a name="l00223"></a>00223                         }
+<a name="l00224"></a>00224                 }
+<a name="l00225"></a>00225                 <span class="comment">// Never reached.</span>
+<a name="l00226"></a>00226                 abort();
+<a name="l00227"></a>00227         }
+<a name="l00228"></a>00228         
+<a name="l00229"></a>00229         <span class="keywordtype">void</span> outboxFlushed(<span class="keyword">const</span> ClientPtr &amp;client) {
+<a name="l00230"></a>00230                 <span class="keywordflow">switch</span> (client-&gt;state) {
+<a name="l00231"></a>00231                 <span class="keywordflow">case</span> Client::ES_CONNECTED:
+<a name="l00232"></a>00232                         watchReadEvents(client, <span class="keyword">true</span>);
+<a name="l00233"></a>00233                         watchWriteEvents(client, <span class="keyword">false</span>);
+<a name="l00234"></a>00234                         <span class="keywordflow">break</span>;
+<a name="l00235"></a>00235                 <span class="keywordflow">case</span> Client::ES_WRITES_PENDING:
+<a name="l00236"></a>00236                         client-&gt;state = Client::ES_CONNECTED;
+<a name="l00237"></a>00237                         watchReadEvents(client, <span class="keyword">true</span>);
+<a name="l00238"></a>00238                         watchWriteEvents(client, <span class="keyword">false</span>);
+<a name="l00239"></a>00239                         <span class="keywordflow">break</span>;
+<a name="l00240"></a>00240                 <span class="keywordflow">case</span> Client::ES_DISCONNECTING_WITH_WRITES_PENDING:
+<a name="l00241"></a>00241                         client-&gt;state = Client::ES_DISCONNECTED;
+<a name="l00242"></a>00242                         client-&gt;fd.close();
+<a name="l00243"></a>00243                         clients.erase(client);
+<a name="l00244"></a>00244                         <span class="keywordflow">break</span>;
+<a name="l00245"></a>00245                 <span class="keywordflow">default</span>:
+<a name="l00246"></a>00246                         <span class="comment">// Never reached.</span>
+<a name="l00247"></a>00247                         abort();
+<a name="l00248"></a>00248                 }
+<a name="l00249"></a>00249         }
+<a name="l00250"></a>00250         
+<a name="l00251"></a>00251         <span class="keywordtype">void</span> outboxNotFlushed(<span class="keyword">const</span> ClientPtr &amp;client) {
+<a name="l00252"></a>00252                 <span class="keywordflow">switch</span> (client-&gt;state) {
+<a name="l00253"></a>00253                 <span class="keywordflow">case</span> Client::ES_CONNECTED:
+<a name="l00254"></a>00254                         client-&gt;state = Client::ES_WRITES_PENDING;
+<a name="l00255"></a>00255                         <span class="comment">// If we have way too much stuff in the outbox then</span>
+<a name="l00256"></a>00256                         <span class="comment">// suspend reading until we've sent out the entire outbox.</span>
+<a name="l00257"></a>00257                         watchReadEvents(client, client-&gt;outbox.size() &lt; 1024 * 32);
+<a name="l00258"></a>00258                         watchWriteEvents(client, <span class="keyword">true</span>);
+<a name="l00259"></a>00259                         <span class="keywordflow">break</span>;
+<a name="l00260"></a>00260                 <span class="keywordflow">case</span> Client::ES_WRITES_PENDING:
+<a name="l00261"></a>00261                 <span class="keywordflow">case</span> Client::ES_DISCONNECTING_WITH_WRITES_PENDING:
+<a name="l00262"></a>00262                         watchReadEvents(client, <span class="keyword">false</span>);
+<a name="l00263"></a>00263                         watchWriteEvents(client, <span class="keyword">true</span>);
+<a name="l00264"></a>00264                         <span class="keywordflow">break</span>;
+<a name="l00265"></a>00265                 <span class="keywordflow">default</span>:
+<a name="l00266"></a>00266                         <span class="comment">// Never reached.</span>
+<a name="l00267"></a>00267                         abort();
+<a name="l00268"></a>00268                 }
+<a name="l00269"></a>00269         }
+<a name="l00270"></a>00270         
+<a name="l00271"></a>00271         <span class="keywordtype">void</span> watchReadEvents(<span class="keyword">const</span> ClientPtr &amp;client, <span class="keywordtype">bool</span> enable = <span class="keyword">true</span>) {
+<a name="l00272"></a>00272                 <span class="keywordflow">if</span> (client-&gt;readWatcherStarted &amp;&amp; !enable) {
+<a name="l00273"></a>00273                         client-&gt;readWatcherStarted = <span class="keyword">false</span>;
+<a name="l00274"></a>00274                         client-&gt;readWatcher.stop();
+<a name="l00275"></a>00275                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (!client-&gt;readWatcherStarted &amp;&amp; enable) {
+<a name="l00276"></a>00276                         client-&gt;readWatcherStarted = <span class="keyword">true</span>;
+<a name="l00277"></a>00277                         client-&gt;readWatcher.start();
+<a name="l00278"></a>00278                 }
+<a name="l00279"></a>00279         }
+<a name="l00280"></a>00280         
+<a name="l00281"></a>00281         <span class="keywordtype">void</span> watchWriteEvents(<span class="keyword">const</span> ClientPtr &amp;client, <span class="keywordtype">bool</span> enable = <span class="keyword">true</span>) {
+<a name="l00282"></a>00282                 <span class="keywordflow">if</span> (client-&gt;writeWatcherStarted &amp;&amp; !enable) {
+<a name="l00283"></a>00283                         client-&gt;writeWatcherStarted = <span class="keyword">false</span>;
+<a name="l00284"></a>00284                         client-&gt;writeWatcher.stop();
+<a name="l00285"></a>00285                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (!client-&gt;writeWatcherStarted &amp;&amp; enable) {
+<a name="l00286"></a>00286                         client-&gt;writeWatcherStarted = <span class="keyword">true</span>;
+<a name="l00287"></a>00287                         client-&gt;writeWatcher.start();
+<a name="l00288"></a>00288                 }
+<a name="l00289"></a>00289         }
+<a name="l00290"></a>00290         
+<a name="l00291"></a>00291         <span class="keywordtype">void</span> onClientWritable(<span class="keyword">const</span> ClientPtr &amp;client) {
+<a name="l00292"></a>00292                 <span class="keywordflow">if</span> (client-&gt;state == Client::ES_DISCONNECTED) {
+<a name="l00293"></a>00293                         <span class="keywordflow">return</span>;
+<a name="l00294"></a>00294                 }
+<a name="l00295"></a>00295                 
+<a name="l00296"></a>00296                 this_thread::disable_syscall_interruption dsi;
+<a name="l00297"></a>00297                 <span class="keywordtype">size_t</span> sent = 0;
+<a name="l00298"></a>00298                 <span class="keywordtype">bool</span> done = client-&gt;outbox.empty();
+<a name="l00299"></a>00299                 
+<a name="l00300"></a>00300                 <span class="keywordflow">while</span> (!done) {
+<a name="l00301"></a>00301                         ssize_t ret = syscalls::write(client-&gt;fd,
+<a name="l00302"></a>00302                                 client-&gt;outbox.data() + sent,
+<a name="l00303"></a>00303                                 client-&gt;outbox.size() - sent);
+<a name="l00304"></a>00304                         <span class="keywordflow">if</span> (ret == -1) {
+<a name="l00305"></a>00305                                 <span class="keywordflow">if</span> (errno != EAGAIN) {
+<a name="l00306"></a>00306                                         printf(<span class="stringliteral">"write error\n"</span>);
+<a name="l00307"></a>00307                                 }
+<a name="l00308"></a>00308                                 done = <span class="keyword">true</span>;
+<a name="l00309"></a>00309                         } <span class="keywordflow">else</span> {
+<a name="l00310"></a>00310                                 sent += ret;
+<a name="l00311"></a>00311                                 done = sent == client-&gt;outbox.size();
+<a name="l00312"></a>00312                         }
+<a name="l00313"></a>00313                 }
+<a name="l00314"></a>00314                 <span class="keywordflow">if</span> (sent &gt; 0) {
+<a name="l00315"></a>00315                         client-&gt;outbox.erase(0, sent);
+<a name="l00316"></a>00316                 }
+<a name="l00317"></a>00317                 
+<a name="l00318"></a>00318                 <span class="keywordflow">if</span> (client-&gt;outbox.empty()) {
+<a name="l00319"></a>00319                         outboxFlushed(client);
+<a name="l00320"></a>00320                 } <span class="keywordflow">else</span> {
+<a name="l00321"></a>00321                         outboxNotFlushed(client);
+<a name="l00322"></a>00322                 }
+<a name="l00323"></a>00323         }
+<a name="l00324"></a>00324         
+<a name="l00325"></a>00325         <span class="keywordtype">void</span> onAcceptable(ev::io &amp;w, <span class="keywordtype">int</span> revents) {
+<a name="l00326"></a>00326                 this_thread::disable_syscall_interruption dsi;
+<a name="l00327"></a>00327                 <span class="keywordtype">int</span> i = 0;
+<a name="l00328"></a>00328                 <span class="keywordtype">bool</span> done = <span class="keyword">false</span>;
+<a name="l00329"></a>00329                 
+<a name="l00330"></a>00330                 <span class="comment">// Accept at most 100 connections on every accept readiness event.</span>
+<a name="l00331"></a>00331                 <span class="keywordflow">while</span> (i &lt; 100 &amp;&amp; !done) {
+<a name="l00332"></a>00332                         <span class="comment">// Reserve enough space to hold both a Unix domain socket</span>
+<a name="l00333"></a>00333                         <span class="comment">// address and an IP socket address.</span>
+<a name="l00334"></a>00334                         <span class="keyword">union </span>{
+<a name="l00335"></a>00335                                 <span class="keyword">struct </span>sockaddr_un local;
+<a name="l00336"></a>00336                                 <span class="keyword">struct </span>sockaddr_in inet;
+<a name="l00337"></a>00337                         } addr;
+<a name="l00338"></a>00338                         socklen_t len = <span class="keyword">sizeof</span>(addr);
+<a name="l00339"></a>00339                         
+<a name="l00340"></a>00340                         <span class="keywordtype">int</span> clientfd = syscalls::accept(fd, (<span class="keyword">struct</span> sockaddr *) &amp;addr, &amp;len);
+<a name="l00341"></a>00341                         <span class="keywordflow">if</span> (clientfd == -1) {
+<a name="l00342"></a>00342                                 <span class="keywordflow">if</span> (errno != EAGAIN &amp;&amp; errno != EWOULDBLOCK) {
+<a name="l00343"></a>00343                                         printf(<span class="stringliteral">"accept error!\n"</span>);
+<a name="l00344"></a>00344                                 }
+<a name="l00345"></a>00345                                 done = <span class="keyword">true</span>;
+<a name="l00346"></a>00346                         } <span class="keywordflow">else</span> {
+<a name="l00347"></a>00347                                 FileDescriptor clientfdGuard = clientfd;
+<a name="l00348"></a>00348                                 <a class="code" href="group__Support.html#g7e3fdc923bdf6efeab407cdd325883a8" title="Sets a socket in non-blocking mode.">setNonBlocking</a>(clientfdGuard);
+<a name="l00349"></a>00349                                 
+<a name="l00350"></a>00350                                 ClientPtr client = createClient();
+<a name="l00351"></a>00351                                 client-&gt;state = Client::ES_CONNECTED;
+<a name="l00352"></a>00352                                 client-&gt;fd = clientfdGuard;
+<a name="l00353"></a>00353                                 client-&gt;readWatcher.set&lt;<a class="code" href="classClient.html" title="A representation of a Client from the Server&amp;#39;s point of view.">Client</a>, &amp;Client::_onReadable&gt;(client.get());
+<a name="l00354"></a>00354                                 client-&gt;readWatcher.set(client-&gt;fd, ev::READ);
+<a name="l00355"></a>00355                                 client-&gt;readWatcher.start();
+<a name="l00356"></a>00356                                 client-&gt;readWatcherStarted = <span class="keyword">true</span>;
+<a name="l00357"></a>00357                                 client-&gt;writeWatcher.set&lt;<a class="code" href="classClient.html" title="A representation of a Client from the Server&amp;#39;s point of view.">Client</a>, &amp;Client::_onWritable&gt;(client.get());
+<a name="l00358"></a>00358                                 client-&gt;writeWatcher.set(client-&gt;fd, ev::WRITE);
+<a name="l00359"></a>00359                                 client-&gt;writeWatcherStarted = <span class="keyword">false</span>;
+<a name="l00360"></a>00360                                 clients.insert(client);
+<a name="l00361"></a>00361                                 onNewClient(client);
+<a name="l00362"></a>00362                         }
+<a name="l00363"></a>00363                         i++;
+<a name="l00364"></a>00364                 }
+<a name="l00365"></a>00365         }
+<a name="l00366"></a>00366         
+<a name="l00367"></a>00367 <span class="keyword">public</span>:
+<a name="l00368"></a>00368         EventedServer(<span class="keyword">struct</span> ev_loop *_loop, FileDescriptor serverFd)
+<a name="l00369"></a>00369                 : loop(_loop),
+<a name="l00370"></a>00370                   acceptWatcher(_loop)
+<a name="l00371"></a>00371         {
+<a name="l00372"></a>00372                 fd = serverFd;
+<a name="l00373"></a>00373                 <a class="code" href="group__Support.html#g7e3fdc923bdf6efeab407cdd325883a8" title="Sets a socket in non-blocking mode.">setNonBlocking</a>(serverFd);
+<a name="l00374"></a>00374                 acceptWatcher.set&lt;EventedServer, &amp;EventedServer::onAcceptable&gt;(<span class="keyword">this</span>);
+<a name="l00375"></a>00375                 acceptWatcher.start(fd, ev::READ);
+<a name="l00376"></a>00376         }
+<a name="l00377"></a>00377         
+<a name="l00378"></a>00378         <span class="keyword">virtual</span> ~EventedServer() { }
+<a name="l00379"></a>00379         
+<a name="l00380"></a>00380         <span class="keyword">struct </span>ev_loop *getLoop()<span class="keyword"> const </span>{
+<a name="l00381"></a>00381                 <span class="keywordflow">return</span> loop;
+<a name="l00382"></a>00382         }
+<a name="l00383"></a>00383 };
+<a name="l00384"></a>00384 
+<a name="l00385"></a>00385 } <span class="comment">// namespace Passenger</span>
+<a name="l00386"></a>00386 
+<a name="l00387"></a>00387 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_EVENTED_SERVER_H_ */</span>
+</pre></div></div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Mar 28 14:11:56 2010 for Passenger by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
+</body>
+</html>