passenger 2.2.1 → 2.2.2

data/Rakefile

@@ -73,21 +73,22 @@ task :clobber
 
 ##### Ruby C extension
 
-subdir 'ext/phusion_passenger' do
-	task :native_support => ["native_support.#{LIBEXT}"]
-	
-	file 'Makefile' => 'extconf.rb' do
-		sh "#{RUBY} extconf.rb"
-	end
-	
-	file "native_support.#{LIBEXT}" => ['Makefile', 'native_support.c'] do
-		sh "make"
-	end
-	
-	task :clean do
-		sh "make clean" if File.exist?('Makefile')
-		sh "rm -f Makefile"
-	end
+task :native_support => "ext/phusion_passenger/native_support.#{LIBEXT}"
+
+file 'ext/phusion_passenger/Makefile' => 'ext/phusion_passenger/extconf.rb' do
+	sh "cd ext/phusion_passenger && #{RUBY} extconf.rb"
+end
+
+file "ext/phusion_passenger/native_support.#{LIBEXT}" => [
+	'ext/phusion_passenger/Makefile',
+	'ext/phusion_passenger/native_support.c'
+] do
+	sh "cd ext/phusion_passenger && make"
+end
+
+task :clean do
+	sh "cd ext/phusion_passenger && make clean" if File.exist?('ext/phusion_passenger/Makefile')
+	sh "rm -f ext/phusion_passenger/Makefile"
 end
 
 
@@ -95,51 +96,47 @@ end
 
 def define_libboost_oxt_task(output_dir, extra_compiler_flags = nil)
 	output_file = "#{output_dir}/libboost_oxt.a"
-	objects_output_dir = "#{output_dir}/libboost_oxt"
-	objects_output_path = Pathname.new(objects_output_dir).expand_path
-	ext_path = Pathname.new("ext").expand_path
-	
-	file(output_file =>
-		Dir['ext/boost/src/*.cpp'] +
-		Dir['ext/boost/src/pthread/*.cpp'] +
-		Dir['ext/oxt/*.cpp'] +
-		Dir['ext/oxt/*.hpp'] +
-		Dir['ext/oxt/detail/*.hpp']
-	) do
-		sh "mkdir -p #{objects_output_dir}/boost #{objects_output_dir}/oxt"
+	output_dir_base = "#{output_dir}/libboost_oxt"
+	flags = "-Iext #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+	
+	# Define compilation targets for .cpp files in ext/boost/src/pthread.
+	boost_object_files = []
+	Dir['ext/boost/src/pthread/*.cpp'].each do |source_file|
+		object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
+		boost_output_dir  = "#{output_dir_base}/boost"
+		object_file = "#{boost_output_dir}/#{object_name}"
+		boost_object_files << object_file
 		
-		Dir.chdir("#{objects_output_dir}/boost") do
-			puts "### In #{objects_output_dir}/boost:"
-			current_dir = Pathname.new(".").expand_path
-			ext_dir = ext_path.relative_path_from(current_dir)
-			flags = "-I#{ext_dir} #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
-			
-			# Compling "pthread/*.cpp" doesn't work on some systems,
-			# so we compile each cpp file invidually instead.
-			Dir["#{ext_dir}/boost/src/pthread/*.cpp"].each do |file|
-				compile_cxx(file, flags)
-			end
-			puts
+		file object_file => source_file do
+			sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
+			compile_cxx(source_file, "#{flags} -o #{object_file}")
 		end
+	end
+	
+	# Define compilation targets for .cpp files in ext/oxt.
+	oxt_object_files = []
+	oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
+	Dir['ext/oxt/*.cpp'].each do |source_file|
+		object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
+		oxt_output_dir  = "#{output_dir_base}/oxt"
+		object_file = "#{oxt_output_dir}/#{object_name}"
+		oxt_object_files << object_file
 		
-		Dir.chdir("#{objects_output_dir}/oxt") do
-			puts "### In #{objects_output_dir}/oxt:"
-			current_dir = Pathname.new(".").expand_path
-			ext_dir = ext_path.relative_path_from(current_dir)
-			flags = "-I#{ext_dir} #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
-			Dir["#{ext_dir}/oxt/*.cpp"].each do |file|
-				compile_cxx(file, flags)
-			end
-			puts
+		file object_file => [source_file, *oxt_dependency_files] do
+			sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
+			compile_cxx(source_file, "#{flags} -o #{object_file}")
 		end
-		
+	end
+	
+	file(output_file => boost_object_files + oxt_object_files) do
+		sh "mkdir -p #{output_dir_base}/boost #{output_dir_base}/oxt"
 		create_static_library(output_file,
-			"#{objects_output_dir}/boost/*.o " <<
-			"#{objects_output_dir}/oxt/*.o")
+			"#{output_dir_base}/boost/*.o " <<
+			"#{output_dir_base}/oxt/*.o")
 	end
 	
 	task :clean do
-		sh "rm -rf #{output_file} #{objects_output_dir}"
+		sh "rm -rf #{output_file} #{output_dir_base}"
 	end
 	
 	return output_file
@@ -156,37 +153,26 @@ def define_common_library_task(output_dir, extra_compiler_flags = nil,
                                extra_linker_flags = nil)
 	static_library = "#{output_dir}/libpassenger_common.a"
 	objects_output_dir = "#{output_dir}/libpassenger_common"
-	objects_output_path = Pathname.new(objects_output_dir).expand_path
-	ext_path = Pathname.new("ext").expand_path
 	targets = [static_library]
 	
-	file(static_library => [
-		'ext/common/Utils.h',
-		'ext/common/Utils.cpp',
-		'ext/common/Logging.h',
-		'ext/common/Logging.cpp',
-		'ext/common/SystemTime.h',
-		'ext/common/SystemTime.cpp',
-		'ext/common/CachedFileStat.h',
-		'ext/common/CachedFileStat.cpp'
-	]) do
-		sh "mkdir -p #{objects_output_dir}"
+	# Define compilation targets for the object files in libpassenger_common.
+	flags =  "-Iext -Iext/common #{extra_compiler_flags} "
+	flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+	common_object_files = []
+	['Utils.cpp', 'Logging.cpp', 'SystemTime.cpp', 'CachedFileStat.cpp'].each do |source_file|
+		object_name = source_file.sub(/\.cpp$/, '.o')
+		object_file = "#{objects_output_dir}/#{object_name}"
+		header_file = source_file.sub(/\.cpp$/, '.h')
+		common_object_files << object_file
 		
-		Dir.chdir(objects_output_dir) do
-			puts "### In #{objects_output_dir}:"
-			current_dir = Pathname.new(".").expand_path
-			ext_dir = ext_path.relative_path_from(current_dir)
-			flags =  "-I#{ext_dir} -I#{ext_dir}/common #{extra_compiler_flags} "
-			flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
-			
-			compile_cxx("#{ext_dir}/common/Utils.cpp", flags)
-			compile_cxx("#{ext_dir}/common/Logging.cpp", flags)
-			compile_cxx("#{ext_dir}/common/SystemTime.cpp", flags)
-			compile_cxx("#{ext_dir}/common/CachedFileStat.cpp", flags)
-			
-			puts
+		file object_file => ["ext/common/#{source_file}", "ext/common/#{header_file}"] do
+			sh "mkdir -p #{objects_output_dir}" if !File.directory?(objects_output_dir)
+			compile_cxx("ext/common/#{source_file}", "#{flags} -o #{object_file}")
 		end
-		
+	end
+	
+	file(static_library => common_object_files) do
+		sh "mkdir -p #{objects_output_dir}"
 		create_static_library(static_library, "#{objects_output_dir}/*.o")
 	end
 	
@@ -256,6 +242,7 @@ end
 			ext/common/Application.h
 			ext/common/MessageChannel.h
 			ext/common/PoolOptions.h
+			ext/common/Version.h
 			ext/common/Utils.h)
 	}
 	APACHE2_OBJECTS = APACHE2_INPUT_FILES.keys

data/bin/passenger-install-nginx-module

@@ -84,7 +84,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 		nginx_config_already_exists_before_installing = nginx_config_exists?(nginx_prefix)
 		compile_passenger_support_files || exit(1)
 		if install_nginx(nginx_source_dir, nginx_prefix, extra_nginx_configure_flags)
-			if nginx_config_already_exists_before_installing
+			if nginx_config_already_exists_before_installing || !locate_nginx_config_file(nginx_prefix)
 				show_passenger_config_snippets(nginx_prefix)
 			else
 				insert_passenger_config_snippets(nginx_prefix)

data/bin/passenger-memory-stats

@@ -219,7 +219,7 @@ class MemoryStats
 			if threads_known
 				p.pid, p.ppid, p.threads, p.vm_size, p.rss, p.name = line.split(/ +/, 6)
 			else
-				p.pid, p.ppid, p.vm_size, p.rss, p.name = line.split(/ +/, 6)
+				p.pid, p.ppid, p.vm_size, p.rss, p.name = line.split(/ +/, 5)
 				p.threads = "?"
 			end
 			p.name.sub!(/\Aruby: /, '')

data/bin/passenger-spawn-server

@@ -42,15 +42,21 @@ begin
 	# we exit without loading the rest of Passenger. If Apache doesn't close
 	# the connection within 4 seconds then we continue with loading Passenger,
 	# so that loading doesn't happen during the first spawn.
-	if select([input], nil, nil, 4) && input.eof?
+	begin
+		if select([input], nil, nil, 4) && input.eof?
+			exit
+		end
+	rescue Interrupt
 		exit
 	end
 	
-	require 'phusion_passenger/spawn_manager'
 	require 'phusion_passenger/utils'
 	if defined?(PhusionPassenger::NativeSupport)
 		PhusionPassenger::NativeSupport.disable_stdio_buffering
 	end
+	PhusionPassenger::Utils.passenger_tmpdir = ARGV[0]
+	
+	require 'phusion_passenger/spawn_manager'
 	spawn_manager = PhusionPassenger::SpawnManager.new
 	spawn_manager.start_synchronously(input)
 	spawn_manager.cleanup

data/doc/Users guide Apache.html

@@ -544,7 +544,7 @@ if it doesn&#8217;t.</p></div>
 <div class="sectionbody">
 <h3 id="_generic_installation_instructions">2.1. Generic installation instructions</h3>
 <h4 id="install_passenger">2.1.1. Overview of download and installation methods</h4>
-<div class="paragraph"><p>There are two ways to install Phusion Passenger:</p></div>
+<div class="paragraph"><p>There are three ways to install Phusion Passenger:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -555,20 +555,21 @@ By installing the Phusion Passenger gem, as instructed on the
 </li>
 <li>
 <p>
-By downloading a native Linux package (e.g. Debian package) from the
-   Phusion Passenger website.
+By downloading the source tarball from the Phusion Passenger website
+   (<em>passenger-x.x.x.tar.gz</em>).
 </p>
 </li>
 <li>
 <p>
-By downloading the source tarball from the Phusion Passenger website
-   (<em>passenger-x.x.x.tar.gz</em>).
+By downloading a native Linux package (e.g. Debian package) from the
+   Phusion Passenger website.
 </p>
 </li>
 </ol></div>
 <div class="paragraph"><p>In our opinion, installing the gem or the native package is easiest.</p></div>
 <div class="paragraph"><p>Phusion Passenger provides an easy-to-use installer for installing the Phusion
-Passenger Apache module (<em>mod_passenger</em>).</p></div>
+Passenger Apache module, in case you choose to install via the gem or the
+source tarball.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -579,16 +580,12 @@ as <em>root</em>. If the installer fails because of permission errors, it will t
 you.</td>
 </tr></table>
 </div>
-<h4 id="specifying_correct_apache_install">2.1.2. Specifying the correct Apache installation</h4>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">You can skip this section if you&#8217;ve installed Phusion Passenger via a
-native Linux package, because no compilation is necessary.</td>
-</tr></table>
-</div>
+<h4 id="_preparation">2.1.2. Preparation</h4>
+<div class="paragraph"><p>If you want to install Phusion Passenger via the gem or the source tarball,
+then some preparation might be required. You can skip this subsection if
+you&#8217;re installing Phusion Passenger via a native Linux package, because no
+compilation is necessary.</p></div>
+<h5 id="specifying_correct_apache_install">Specifying the correct Apache installation</h5>
 <div class="paragraph"><p>If your system has multiple Apache installations (this is likely the case on
 MacOS X), then you will need to tell the Phusion Passenger installer which one
 to use. If you only have one Apache installation (the case on most Linux
@@ -612,16 +609,7 @@ environment variable. Suppose that you want to use the Apache installation in
 be located in the <tt>sbin</tt> folder instead of the <tt>bin</tt> folder.</td>
 </tr></table>
 </div>
-<h4 id="specifying_ruby_installation">2.1.3. Specifying the correct Ruby installation</h4>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">You can skip this section if you&#8217;ve installed Phusion Passenger via a
-native Linux package, because no compilation is necessary.</td>
-</tr></table>
-</div>
+<h5 id="specifying_ruby_installation">Specifying the correct Ruby installation</h5>
 <div class="paragraph"><p>If your system has multiple Ruby installations&#8201;&#8212;&#8201;which is likely the case on
 MacOS X, or if you&#8217;ve also installed
 <a href="http://www.rubyenterpriseedition.com">Ruby Enterprise Edition</a>&#8201;&#8212;&#8201;then you
@@ -649,7 +637,7 @@ following Ruby installations:</p></div>
 <div class="content">
 <pre><tt>export PATH=/opt/myruby/bin:$PATH</tt></pre>
 </div></div>
-<h4 id="_installing_via_the_gem">2.1.4. Installing via the gem</h4>
+<h4 id="_installing_via_the_gem">2.1.3. Installing via the gem</h4>
 <div class="paragraph"><p>Please install the gem and then run the Phusion Passenger installer, by typing the
 following commands:</p></div>
 <div class="listingblock">
@@ -658,17 +646,7 @@ following commands:</p></div>
 passenger-install-apache2-module</tt></pre>
 </div></div>
 <div class="paragraph"><p>Please follow the instructions given by the installer.</p></div>
-<h4 id="_installing_via_a_native_linux_package">2.1.5. Installing via a native Linux package</h4>
-<div class="paragraph"><p>John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the <a href="http://apt.brightbox.net">Brightbox repository</a>.</p></div>
-<div class="paragraph"><p>Please install the native Linux package, e.g.:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" &gt; /etc/apt/sources.list.d/brightbox.list'
-sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -'
-sudo apt-get update
-sudo apt-get install libapache2-mod-passenger</tt></pre>
-</div></div>
-<h4 id="_installing_via_the_source_tarball">2.1.6. Installing via the source tarball</h4>
+<h4 id="_installing_via_the_source_tarball">2.1.4. Installing via the source tarball</h4>
 <div class="paragraph"><p>Extract the tarball to whatever location you prefer. <strong>The Phusion Passenger files
 are to reside in that location permanently.</strong> For example, if you would like
 Phusion Passenger to reside in <tt>/opt/passenger-x.x.x</tt>:</p></div>
@@ -692,6 +670,16 @@ tar xzvf ~/YourDownloadsFolder/passenger-x.x.x.tar.gz</tt></pre>
 installation. Furthermore, the <em>passenger-x.x.x</em> folder must be accessible by Apache.</td>
 </tr></table>
 </div>
+<h4 id="_installing_via_a_native_linux_package">2.1.5. Installing via a native Linux package</h4>
+<div class="paragraph"><p>John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the <a href="http://apt.brightbox.net">Brightbox repository</a>.</p></div>
+<div class="paragraph"><p>Please install the native Linux package, e.g.:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" &gt; /etc/apt/sources.list.d/brightbox.list'
+sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -'
+sudo apt-get update
+sudo apt-get install libapache2-mod-passenger</tt></pre>
+</div></div>
 <h3 id="_operating_system_specific_instructions_and_information">2.2. Operating system-specific instructions and information</h3>
 <h4 id="_macos_x">2.2.1. MacOS X</h4>
 <div class="paragraph"><p>Ben Ruebenstein has written an excellent
@@ -700,14 +688,8 @@ on installing Phusion Passenger on OS X</a>.</p></div>
 <h4 id="_ubuntu_linux">2.2.2. Ubuntu Linux</h4>
 <div class="paragraph"><p>Ben Hughes has written an <a href="http://www.railsgarden.com/2008/04/12/configurating-passenger-mod_rails-on-slicehost-with-ubuntu-710/">article on installing Phusion Passenger on Ubuntu</a>.</p></div>
 <h4 id="_opensolaris">2.2.3. OpenSolaris</h4>
-<div class="olist upperalpha"><ol class="upperalpha">
-<li>
-<p>
-Aaron Farr has written a <a href="http://cubiclemuses.com/cm/articles/2009/04/09/rails-passenger-open-solaris-ec2/">guide</a>
-about setting up Ruby on Rails and Phusion Passenger on OpenSolaris and EC2.
-</p>
-</li>
-</ol></div>
+<div class="paragraph"><p>J Aaron Farr has written a <a href="http://cubiclemuses.com/cm/articles/2009/04/09/rails-passenger-open-solaris-ec2/">guide</a>
+about setting up Ruby on Rails and Phusion Passenger on OpenSolaris and EC2.</p></div>
 </div>
 <h2 id="_deploying_a_ruby_on_rails_application">3. Deploying a Ruby on Rails application</h2>
 <div class="sectionbody">
@@ -1049,9 +1031,11 @@ run Merb::Rack::Application.new</tt></pre>
 <h4 id="_ramaze">4.5.5. Ramaze</h4>
 <div class="listingblock">
 <div class="content">
-<pre><tt>require "start"
+<pre><tt>require "rubygems"
+require "ramaze"
 Ramaze.trait[:essentials].delete Ramaze::Adapter
-Ramaze.start :force =&gt; true
+require "start"
+Ramaze.start!
 run Ramaze::Adapter::Base</tt></pre>
 </div></div>
 <h4 id="_sinatra">4.5.6. Sinatra</h4>
@@ -3138,7 +3122,7 @@ has no effect.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-16 19:42:11 CEST
+Last updated 2009-04-25 13:39:21 CEST
 </div>
 </div>
 </body>

data/doc/Users guide Apache.txt

@@ -54,30 +54,34 @@ if it doesn't.
 [[install_passenger]]
 ==== Overview of download and installation methods ====
 
-There are two ways to install Phusion Passenger:
+There are three ways to install Phusion Passenger:
 
 1. By installing the Phusion Passenger gem, as instructed on the
    link:http://www.modrails.com/install.html[``Install'' page on the Phusion
    Passenger website].
-2. By downloading a native Linux package (e.g. Debian package) from the
-   Phusion Passenger website.
-3. By downloading the source tarball from the Phusion Passenger website
+2. By downloading the source tarball from the Phusion Passenger website
    ('passenger-x.x.x.tar.gz').
+3. By downloading a native Linux package (e.g. Debian package) from the
+   Phusion Passenger website.
 
 In our opinion, installing the gem or the native package is easiest.
 
 Phusion Passenger provides an easy-to-use installer for installing the Phusion
-Passenger Apache module ('mod_passenger').
+Passenger Apache module, in case you choose to install via the gem or the
+source tarball.
 
 TIP: You might have to run the installation commands in the following sections
 as 'root'. If the installer fails because of permission errors, it will tell
 you.
 
-[[specifying_correct_apache_install]]
-==== Specifying the correct Apache installation ====
+==== Preparation
+If you want to install Phusion Passenger via the gem or the source tarball,
+then some preparation might be required. You can skip this subsection if
+you're installing Phusion Passenger via a native Linux package, because no
+compilation is necessary.
 
-NOTE: You can skip this section if you've installed Phusion Passenger via a
-native Linux package, because no compilation is necessary.
+[[specifying_correct_apache_install]]
+===== Specifying the correct Apache installation =====
 
 If your system has multiple Apache installations (this is likely the case on
 MacOS X), then you will need to tell the Phusion Passenger installer which one
@@ -98,10 +102,7 @@ NOTE: On some systems, the `apxs` program might be called `apxs2`, and it might
 be located in the `sbin` folder instead of the `bin` folder.
 
 [[specifying_ruby_installation]]
-==== Specifying the correct Ruby installation ====
-
-NOTE: You can skip this section if you've installed Phusion Passenger via a
-native Linux package, because no compilation is necessary.
+===== Specifying the correct Ruby installation =====
 
 If your system has multiple Ruby installations -- which is likely the case on
 MacOS X, or if you've also installed
@@ -136,19 +137,6 @@ passenger-install-apache2-module
 Please follow the instructions given by the installer.
 
 
-==== Installing via a native Linux package ====
-
-John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the link:http://apt.brightbox.net[Brightbox repository].
-
-Please install the native Linux package, e.g.:
-------------------------------------------------------
-sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" > /etc/apt/sources.list.d/brightbox.list'
-sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -'
-sudo apt-get update
-sudo apt-get install libapache2-mod-passenger
-------------------------------------------------------
-
-
 ==== Installing via the source tarball ====
 
 Extract the tarball to whatever location you prefer. *The Phusion Passenger files
@@ -169,6 +157,19 @@ IMPORTANT: Please do not remove the 'passenger-x.x.x' folder after
 installation. Furthermore, the 'passenger-x.x.x' folder must be accessible by Apache.
 
 
+==== Installing via a native Linux package ====
+
+John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the link:http://apt.brightbox.net[Brightbox repository].
+
+Please install the native Linux package, e.g.:
+------------------------------------------------------
+sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" > /etc/apt/sources.list.d/brightbox.list'
+sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -'
+sudo apt-get update
+sudo apt-get install libapache2-mod-passenger
+------------------------------------------------------
+
+
 === Operating system-specific instructions and information ===
 
 ==== MacOS X ====
@@ -183,7 +184,7 @@ Ben Hughes has written an link:http://www.railsgarden.com/2008/04/12/configurati
 
 ==== OpenSolaris ====
 
-J. Aaron Farr has written a link:http://cubiclemuses.com/cm/articles/2009/04/09/rails-passenger-open-solaris-ec2/[guide]
+J Aaron Farr has written a link:http://cubiclemuses.com/cm/articles/2009/04/09/rails-passenger-open-solaris-ec2/[guide]
 about setting up Ruby on Rails and Phusion Passenger on OpenSolaris and EC2.