passenger 4.0.5 → 4.0.6

data/test/ruby/spec_helper.rb

@@ -27,7 +27,6 @@ end
 
 DEBUG = boolean_option('DEBUG')
 TEST_CLASSIC_RAILS = boolean_option('TEST_CLASSIC_RAILS', true)
-AGENTS_DIR = "#{source_root}/agents"
 
 $LOAD_PATH.unshift("#{source_root}/lib")
 $LOAD_PATH.unshift("#{source_root}/test")

data/test/stub/apache2/httpd.conf.erb

@@ -79,7 +79,7 @@ DocumentRoot "<%= @server_root %>"
 	LockFile  <%= @server_root %>/httpd.lock
 <% end %>
 PidFile   <%= @server_root %>/httpd.pid
-ErrorLog  <%= @passenger_root %>/test/test.log
+ErrorLog  <%= @server_root %>/../test.log
 CustomLog <%= @server_root %>/access.log combined
 
 <% if !vhosts.empty? && PlatformInfo.httpd_version < '2.4.0' %>

data/test/stub/nginx/nginx.conf.erb

@@ -12,6 +12,7 @@ http {
     default_type       application/octet-stream;
     sendfile           on;
     keepalive_timeout  65;
+    server_names_hash_bucket_size 64;
     
     log_format  main  '$remote_addr - $remote_user [$time_local] $request '
                       '"$status" $body_bytes_sent "$http_referer" '

data/test/support/apache2_controller.rb

@@ -71,7 +71,7 @@ class Apache2Controller
 		@extra = []
 		@server_root = File.expand_path('tmp.apache2')
 		@passenger_root = File.expand_path(PhusionPassenger.source_root)
-		@mod_passenger = File.expand_path(PhusionPassenger.source_root + "/libout/apache2/mod_passenger.so")
+		@mod_passenger = PhusionPassenger.apache2_module_path
 	end
 	
 	def set(options)

data/test/support/placebo-preloader.rb

@@ -33,7 +33,7 @@ def process_client_command(server, client, command)
 			options[name] = value
 		end
 		
-		command = options["start_command"].split("\1")
+		command = options["start_command"].split("\t")
 		process_title = options["process_title"]
 		process_title = command[0] if !process_title || process_title.empty?
 		command[0] = [command[0], process_title]

data/test/support/test_helper.rb

@@ -358,14 +358,17 @@ module TestHelper
 	def spawn_logging_agent(dump_file, password)
 		passenger_tmpdir = PhusionPassenger::Utils.passenger_tmpdir
 		socket_filename = "#{passenger_tmpdir}/logging.socket"
-		pid = spawn_process("#{AGENTS_DIR}/PassengerLoggingAgent",
+		pid = spawn_process("#{PhusionPassenger.agents_dir}/PassengerLoggingAgent",
+			"passenger_root", PhusionPassenger.source_root,
 			"log_level", PhusionPassenger::DebugLogging.log_level,
 			"analytics_dump_file", dump_file,
 			"analytics_log_user",  CONFIG['normal_user_1'],
 			"analytics_log_group", CONFIG['normal_group_1'],
 			"analytics_log_permissions", "u=rwx,g=rwx,o=rwx",
 			"logging_agent_address", "unix:#{socket_filename}",
-			"logging_agent_password", password)
+			"logging_agent_password", password,
+			"logging_agent_admin_address", "unix:#{socket_filename}_admin",
+			"admin_tool_status_password", password)
 		eventually do
 			File.exist?(socket_filename)
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ files:
 - configure
 - Rakefile
 - README.md
+- CONTRIBUTORS
 - CONTRIBUTING.md
 - LICENSE
 - INSTALL.md
@@ -86,12 +87,14 @@ files:
 - build/common_library.rb
 - build/cplusplus_support.rb
 - build/cxx_tests.rb
+- build/debian.rb
 - build/documentation.rb
 - build/integration_tests.rb
 - build/misc.rb
 - build/nginx.rb
 - build/oxt_tests.rb
 - build/packaging.rb
+- build/preprocessor.rb
 - build/rake_extensions.rb
 - build/rpm.rb
 - build/ruby_extension.rb
@@ -231,11 +234,13 @@ files:
 - doc/Users guide Standalone.html
 - doc/Users guide Standalone.idmap.txt
 - doc/Users guide Standalone.txt
+- doc/users_guide_snippets/alternative_for_flying_passenger.txt
 - doc/users_guide_snippets/analysis_and_system_maintenance.txt
 - doc/users_guide_snippets/appendix_a_about.txt
 - doc/users_guide_snippets/appendix_b_terminology.txt
 - doc/users_guide_snippets/appendix_c_spawning_methods.txt
 - doc/users_guide_snippets/enterprise_only.txt
+- doc/users_guide_snippets/environment_variables.txt
 - doc/users_guide_snippets/global_queueing_explained.txt
 - doc/users_guide_snippets/installation.txt
 - doc/users_guide_snippets/passenger_spawn_method.txt
@@ -249,20 +254,27 @@ files:
 - man/passenger-memory-stats.8
 - man/passenger-status.8
 - man/passenger-stress-test.1
-- debian/changelog
-- debian/compat
-- debian/control
-- debian/copyright
-- debian/libapache2-mod-passenger.install
-- debian/libapache2-mod-passenger.postinst
-- debian/libapache2-mod-passenger.prerm
-- debian/passenger-common.install
-- debian/passenger.conf
-- debian/passenger.load
-- debian/prerm
-- debian/README.Debian
-- debian/rules
-- debian/watch
+- debian.template/changelog
+- debian.template/compat
+- debian.template/control
+- debian.template/copyright
+- debian.template/libapache2-mod-passenger.install
+- debian.template/libapache2-mod-passenger.postinst
+- debian.template/libapache2-mod-passenger.prerm
+- debian.template/locations.ini
+- debian.template/passenger.conf
+- debian.template/passenger.load
+- debian.template/patches/series
+- debian.template/README.Debian
+- debian.template/repack.sh
+- debian.template/ruby-passenger-dev.install
+- debian.template/ruby-passenger-doc.install
+- debian.template/ruby-passenger.docs
+- debian.template/ruby-passenger.install
+- debian.template/ruby-passenger.manpages
+- debian.template/rules.template
+- debian.template/source/format
+- debian.template/watch
 - helper-scripts/backtrace-sanitizer.rb
 - helper-scripts/classic-rails-loader.rb
 - helper-scripts/classic-rails-preloader.rb
@@ -308,10 +320,10 @@ files:
 - ext/common/AccountsDatabase.h
 - ext/common/agents/Base.h
 - ext/common/agents/HelperAgent/AgentOptions.h
-- ext/common/agents/HelperAgent/BacktracesServer.h
 - ext/common/agents/HelperAgent/FileBackedPipe.h
 - ext/common/agents/HelperAgent/RequestHandler.h
 - ext/common/agents/HelperAgent/ScgiRequestParser.h
+- ext/common/agents/LoggingAgent/AdminController.h
 - ext/common/agents/LoggingAgent/DataStoreId.h
 - ext/common/agents/LoggingAgent/FilterSupport.h
 - ext/common/agents/LoggingAgent/LoggingServer.h
@@ -2203,7 +2215,6 @@ files:
 - ext/ruby/extconf.rb
 - dev/copy_boost_headers.rb
 - dev/find_owner_pipe_leaks.rb
-- dev/googlecode_upload.py
 - dev/render_error_pages.rb
 - dev/run_travis.sh
 - resources/mime.types
@@ -2219,13 +2230,14 @@ files:
 - resources/templates/error_layout.html.template
 - resources/templates/general_error.html.template
 - resources/templates/general_error_with_html.html.template
+- resources/templates/installer_common/freebsd9_broken_cxx_runtime.txt.erb
+- resources/templates/installer_common/low_amount_of_memory_warning.txt.erb
 - resources/templates/nginx/ask_for_extra_configure_flags.txt.erb
 - resources/templates/nginx/cannot_write_to_dir.txt.erb
 - resources/templates/nginx/config_snippets.txt.erb
 - resources/templates/nginx/config_snippets_inserted.txt.erb
 - resources/templates/nginx/confirm_extra_configure_flags.txt.erb
 - resources/templates/nginx/deployment_example.txt.erb
-- resources/templates/nginx/not_available_when_natively_packaged.txt.erb
 - resources/templates/nginx/pcre_checksum_could_not_be_verified.txt.erb
 - resources/templates/nginx/pcre_could_not_be_downloaded.txt.erb
 - resources/templates/nginx/pcre_could_not_be_extracted.txt.erb
@@ -2324,6 +2336,7 @@ files:
 - test/integration_tests/hello_world_rack_spec.rb
 - test/integration_tests/hello_world_wsgi_spec.rb
 - test/integration_tests/mycook_spec.rb
+- test/integration_tests/native_packaging_spec.rb
 - test/integration_tests/nginx_tests.rb
 - test/integration_tests/spec_helper.rb
 - test/stub/apache2/httpd.conf.erb
@@ -2405,7 +2418,6 @@ files:
 - test/stub/rails3.0/test/performance/browsing_test.rb
 - test/stub/rails3.0/test/test_helper.rb
 - test/stub/rails3.1/app/assets/images/rails.png
-- test/stub/rails3.1/app/assets/javascripts/application.js
 - test/stub/rails3.1/app/assets/stylesheets/application.css
 - test/stub/rails3.1/app/controllers/application_controller.rb
 - test/stub/rails3.1/app/helpers/application_helper.rb
@@ -2443,7 +2455,6 @@ files:
 - test/stub/rails3.1/test/performance/browsing_test.rb
 - test/stub/rails3.1/test/test_helper.rb
 - test/stub/rails3.2/app/assets/images/rails.png
-- test/stub/rails3.2/app/assets/javascripts/application.js
 - test/stub/rails3.2/app/assets/stylesheets/application.css
 - test/stub/rails3.2/app/controllers/application_controller.rb
 - test/stub/rails3.2/app/helpers/application_helper.rb
@@ -2665,11 +2676,6 @@ files:
 - test/stub/rails_apps/2.3/mycook/public/images/cookbook.gif
 - test/stub/rails_apps/2.3/mycook/public/images/header.png
 - test/stub/rails_apps/2.3/mycook/public/images/rails.png
-- test/stub/rails_apps/2.3/mycook/public/javascripts/application.js
-- test/stub/rails_apps/2.3/mycook/public/javascripts/controls.js
-- test/stub/rails_apps/2.3/mycook/public/javascripts/dragdrop.js
-- test/stub/rails_apps/2.3/mycook/public/javascripts/effects.js
-- test/stub/rails_apps/2.3/mycook/public/javascripts/prototype.js
 - test/stub/rails_apps/2.3/mycook/public/robots.txt
 - test/stub/rails_apps/2.3/mycook/public/uploads.html
 - test/stub/rails_apps/2.3/mycook/public/welcome/cached.html

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRpgpHAAoJECrHRaUKISqMaUsH/36pNJGxryARsxpddPgRmhUh
-iilOVBDcfD8kun8/OUdfaAdabr3AXsRJsTzYAeac7SM+6FQ2h7rPKOK4eyQCICPm
-bgJ82TXu/TGbiSvzXrNGTg8Lx+xg0p+kv8jhbLN5zZoXFVPbFv0O6A6T8ExU7Fbr
-qNJPFAMdnIN2X4qx6wbCz8mcUDuq8LrQ7wp85+WrsvTam9t6H3MHEnrewC25DTrD
-hlay1dc7o1rb98Skz16rLdoPMiAO7VpBHzxpRBnarnnS0okHNLKzmNEyLGEwuUwj
-WTptq1vvism04T/tY0+m0RZvc8Ev58ydWH6O2ZsI3M6Zu5iZkWqtBj+jU0oZcZQ=
-=nU+e
+iQEcBAABAgAGBQJR1eJgAAoJECrHRaUKISqMIQUH/3xy6DwmpTlbAhmkO0xL8gAu
+RHju6gRXoJPnCuwLYeDTErawtZ3XY2nMvF/qm7H01Nmi4+LF+sWHmFksFiYciXsR
+eEkJSyQP6pzXkbmGzvAsaQZ8zV9QuxCjeJFxJa+ouqUi31o7eA2k8u5HP8fXfUjl
+UXA/YwPc7vqxpLpZXCv0nBBHAzk3gG/sjvRIFzoTDvX/DGIVCHCHOhA+bkh3FpLx
+9WoIsYE52LzhYMrzE5wwttWL5NHBW8Q3ygzgkzy84RUNInhHf2gLQ2G1qUZ9V9XQ
+8NgJoZXu8W9N4cI8OVvpVFlL2Hrp7LfsEJE+fRH9defkYKaYyNpYHZCa5mB7voY=
+=GbQl
 -----END PGP SIGNATURE-----

data/debian/compat

@@ -1 +0,0 @@
-5

data/debian/control

@@ -1,49 +0,0 @@
-Source: passenger
-Section: web
-Priority: optional
-Maintainer: John Leach <john@brightbox.co.uk>
-Build-Depends: apache2-threaded-dev, apache2-mpm-worker | apache2-mpm-prefork,
- libapr1-dev, ruby, rubygems, debhelper (>= 5.0.44), ruby1.8-dev, doxygen,
- asciidoc (>= 8.2), graphviz, rake, cdbs, source-highlight, libev-dev,
- libcurl4-openssl-dev
-Standards-Version: 3.8.0
-Homepage: http://www.modrails.com/
-XS-Vcs-git: git://github.com/FooBarWidget/passenger.git
-XS-Vcs-browser: https://github.com/FooBarWidget/passenger
-
-Package: passenger-common
-Architecture: any
-Depends: ${shlibs:Depends}, ruby, librack-ruby1.8 (>= 1.0.0)
-Conflicts: libapache2-mod-passenger (< 2.2.1-1bbox1)
-Suggests: python, rails, passenger-doc, rubygems (>= 1.0)
-Description: Rails and Rack support for Apache2
- Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
- deployment of Ruby web applications, such as those built on the
- revolutionary Ruby on Rails web framework, a breeze.
- .
- This package provides the bits of Passenger common to both its Apache 
- and NGINX support.
-
-Package: libapache2-mod-passenger
-Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common, 
- passenger-common (= ${binary:Version})
-Suggests: python, rails, passenger-doc, rubygems (>= 1.0)
-Description: Rails and Rack support for Apache2
- Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
- deployment of Ruby web applications, such as those built on the
- revolutionary Ruby on Rails web framework, a breeze.
- .
- This package provides the Phusion Passenger loadable Apache module
-
-Package: passenger-doc
-Section: doc
-Architecture: all
-Suggests: www-browse
-Description: Rails and Rac support for Apache2 - Documentation
- Phusion Passenger — a.k.a. mod_rails or mod_rack — makes
- deployment of Ruby web applications, such as those built on the
- revolutionary Ruby on Rails web framework, a breeze.
- .
- This package provides the documentation for Phusion Passenger.
-

data/debian/copyright

@@ -1,20 +0,0 @@
-Upstream : Copyright (c) 2010 Phusion
-Packaging: Copyright (c) 2010 Brightbox Systems
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/debian/libapache2-mod-passenger.install

@@ -1 +0,0 @@
-../passenger.{conf,load} etc/apache2/mods-available

data/debian/passenger-common.install

@@ -1,4 +0,0 @@
-usr/lib/ruby
-usr/lib/phusion-passenger
-usr/share/phusion-passenger
-usr/sbin

data/debian/passenger.conf

@@ -1,4 +0,0 @@
-<IfModule mod_passenger.c>
-  PassengerRoot /usr
-  PassengerRuby /usr/bin/ruby
-</IfModule>

data/debian/prerm

@@ -1,2 +0,0 @@
-#!/bin/sh
-

data/debian/rules

@@ -1,37 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE=1
-export CFLAGS="-g -O0 -burgers"
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
-DEB_INSTALL_DOCS_passenger-doc += DEVELOPERS.TXT $(DEB_DESTDIR)/usr/share/doc/phusion-passenger/
-DEB_INSTALL_MANPAGES_passenger-common += man/*
-
-
-bindir = usr/bin
-sbindir = usr/sbin
-builddir = pkg/fakeroot
-moddir = $(shell apxs2 -q LIBEXECDIR)
-modsavailabledir = etc/apache2/mods-available
-passengermodule = usr/lib/apache2/modules/mod_passenger.so
-
-clean::
-	rake clean
-
-build/passenger-common build/libapache2-mod-passenger build/passenger-doc::
-	rake fakeroot APXS2=/usr/bin/apxs2 USE_VENDORED_LIBEV=no RELEASE=yes
-	rm -rf $(DEB_DESTDIR)
-	mv $(builddir) $(DEB_DESTDIR)
-
-install/passenger-common::
-	rm -rf $(DEB_DESTDIR)/usr/share/phusion-passenger/source
-	rm $(DEB_DESTDIR)/usr/bin/passenger-install-*
-
-install/libapache2-mod-passenger::
-	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/$(moddir)
-	mv $(DEB_DESTDIR)/$(passengermodule) $(CURDIR)/debian/$(cdbs_curpkg)/$(moddir)
-
-get-orig-source:
-	uscan --verbose --force-download

data/debian/watch

@@ -1,3 +0,0 @@
-# Compulsory line, this is a version 3 file
-version=3
-http://rubyforge.org/frs/?group_id=5873	.*/passenger-(.*).tar.gz debian git-import-orig

data/dev/googlecode_upload.py

@@ -1,265 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006, 2007 Google Inc. All Rights Reserved.
-# Author: danderson@google.com (David Anderson)
-#
-# Script for uploading files to a Google Code project.
-#
-# This is intended to be both a useful script for people who want to
-# streamline project uploads and a reference implementation for
-# uploading files to Google Code projects.
-#
-# To upload a file to Google Code, you need to provide a path to the
-# file on your local machine, a small summary of what the file is, a
-# project name, and a valid account that is a member or owner of that
-# project.  You can optionally provide a list of labels that apply to
-# the file.  The file will be uploaded under the same name that it has
-# in your local filesystem (that is, the "basename" or last path
-# component).  Run the script with '--help' to get the exact syntax
-# and available options.
-#
-# Note that the upload script requests that you enter your
-# googlecode.com password.  This is NOT your Gmail account password!
-# This is the password you use on googlecode.com for committing to
-# Subversion and uploading files.  You can find your password by going
-# to http://code.google.com/hosting/settings when logged in with your
-# Gmail account. If you have already committed to your project's
-# Subversion repository, the script will automatically retrieve your
-# credentials from there (unless disabled, see the output of '--help'
-# for details).
-#
-# If you are looking at this script as a reference for implementing
-# your own Google Code file uploader, then you should take a look at
-# the upload() function, which is the meat of the uploader.  You
-# basically need to build a multipart/form-data POST request with the
-# right fields and send it to https://PROJECT.googlecode.com/files .
-# Authenticate the request using HTTP Basic authentication, as is
-# shown below.
-#
-# Licensed under the terms of the Apache Software License 2.0:
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Questions, comments, feature requests and patches are most welcome.
-# Please direct all of these to the Google Code users group:
-#  http://groups.google.com/group/google-code-hosting
-
-"""Google Code file uploader script.
-"""
-
-__author__ = 'danderson@google.com (David Anderson)'
-
-import httplib
-import os.path
-import optparse
-import getpass
-import base64
-import sys
-
-
-def upload(file, project_name, user_name, password, summary, labels=None):
-  """Upload a file to a Google Code project's file server.
-
-  Args:
-    file: The local path to the file.
-    project_name: The name of your project on Google Code.
-    user_name: Your Google account name.
-    password: The googlecode.com password for your account.
-              Note that this is NOT your global Google Account password!
-    summary: A small description for the file.
-    labels: an optional list of label strings with which to tag the file.
-
-  Returns: a tuple:
-    http_status: 201 if the upload succeeded, something else if an
-                 error occured.
-    http_reason: The human-readable string associated with http_status
-    file_url: If the upload succeeded, the URL of the file on Google
-              Code, None otherwise.
-  """
-  # The login is the user part of user@gmail.com. If the login provided
-  # is in the full user@domain form, strip it down.
-  if user_name.endswith('@gmail.com'):
-    user_name = user_name[:user_name.index('@gmail.com')]
-
-  form_fields = [('summary', summary)]
-  if labels is not None:
-    form_fields.extend([('label', l.strip()) for l in labels])
-
-  content_type, body = encode_upload_request(form_fields, file)
-
-  upload_host = '%s.googlecode.com' % project_name
-  upload_uri = '/files'
-  auth_token = base64.b64encode('%s:%s'% (user_name, password))
-  headers = {
-    'Authorization': 'Basic %s' % auth_token,
-    'User-Agent': 'Googlecode.com uploader v0.9.4',
-    'Content-Type': content_type,
-    }
-
-  server = httplib.HTTPSConnection(upload_host)
-  server.request('POST', upload_uri, body, headers)
-  resp = server.getresponse()
-  server.close()
-
-  if resp.status == 201:
-    location = resp.getheader('Location', None)
-  else:
-    location = None
-  return resp.status, resp.reason, location
-
-
-def encode_upload_request(fields, file_path):
-  """Encode the given fields and file into a multipart form body.
-
-  fields is a sequence of (name, value) pairs. file is the path of
-  the file to upload. The file will be uploaded to Google Code with
-  the same file name.
-
-  Returns: (content_type, body) ready for httplib.HTTP instance
-  """
-  BOUNDARY = '----------Googlecode_boundary_reindeer_flotilla'
-  CRLF = '\r\n'
-
-  body = []
-
-  # Add the metadata about the upload first
-  for key, value in fields:
-    body.extend(
-      ['--' + BOUNDARY,
-       'Content-Disposition: form-data; name="%s"' % key,
-       '',
-       value,
-       ])
-
-  # Now add the file itself
-  file_name = os.path.basename(file_path)
-  f = open(file_path, 'rb')
-  file_content = f.read()
-  f.close()
-
-  body.extend(
-    ['--' + BOUNDARY,
-     'Content-Disposition: form-data; name="filename"; filename="%s"'
-     % file_name,
-     # The upload server determines the mime-type, no need to set it.
-     'Content-Type: application/octet-stream',
-     '',
-     file_content,
-     ])
-
-  # Finalize the form body
-  body.extend(['--' + BOUNDARY + '--', ''])
-
-  return 'multipart/form-data; boundary=%s' % BOUNDARY, CRLF.join(body)
-
-
-def upload_find_auth(file_path, project_name, summary, labels=None,
-                     user_name=None, password=None, tries=3):
-  """Find credentials and upload a file to a Google Code project's file server.
-
-  file_path, project_name, summary, and labels are passed as-is to upload.
-
-  Args:
-    file_path: The local path to the file.
-    project_name: The name of your project on Google Code.
-    summary: A small description for the file.
-    labels: an optional list of label strings with which to tag the file.
-    config_dir: Path to Subversion configuration directory, 'none', or None.
-    user_name: Your Google account name.
-    tries: How many attempts to make.
-  """
-  if user_name is None or password is None:
-    from netrc import netrc
-    try:
-      authenticators = netrc().authenticators("code.google.com")
-    except IOError as e:
-      sys.stderr.write(str(e) + "\n\n")
-      sys.stderr.write("It seems that you don't have ~/.netrc. You must " +
-        "configure this file so that this script can authenticate with " +
-        "Google Code. This file must contain your Google Code password " +
-        "(which is NOT your Google account password)! Please visit " +
-        "http://code.google.com/hosting/settings for instructions.\n")
-      sys.exit(1)
-    if authenticators:
-      if user_name is None:
-        user_name = authenticators[0]
-      if password is None:
-        password = authenticators[2]
-
-  while tries > 0:
-    if user_name is None:
-      # Read username if not specified or loaded from svn config, or on
-      # subsequent tries.
-      sys.stdout.write('Please enter your googlecode.com username: ')
-      sys.stdout.flush()
-      user_name = sys.stdin.readline().rstrip()
-    if password is None:
-      # Read password if not loaded from svn config, or on subsequent tries.
-      print 'Please enter your googlecode.com password.'
-      print '** Note that this is NOT your Gmail account password! **'
-      print 'It is the password you use to access Subversion repositories,'
-      print 'and can be found here: http://code.google.com/hosting/settings'
-      password = getpass.getpass()
-
-    status, reason, url = upload(file_path, project_name, user_name, password,
-                                 summary, labels)
-    # Returns 403 Forbidden instead of 401 Unauthorized for bad
-    # credentials as of 2007-07-17.
-    if status in [httplib.FORBIDDEN, httplib.UNAUTHORIZED]:
-      # Rest for another try.
-      user_name = password = None
-      tries = tries - 1
-    else:
-      # We're done.
-      break
-
-  return status, reason, url
-
-
-def main():
-  parser = optparse.OptionParser(usage='googlecode-upload.py -s SUMMARY '
-                                 '-p PROJECT [options] FILE')
-  parser.add_option('-s', '--summary', dest='summary',
-                    help='Short description of the file')
-  parser.add_option('-p', '--project', dest='project',
-                    help='Google Code project name')
-  parser.add_option('-u', '--user', dest='user',
-                    help='Your Google Code username')
-  parser.add_option('-w', '--password', dest='password',
-                    help='Your Google Code password')
-  parser.add_option('-l', '--labels', dest='labels',
-                    help='An optional list of comma-separated labels to attach '
-                    'to the file')
-
-  options, args = parser.parse_args()
-
-  if not options.summary:
-    parser.error('File summary is missing.')
-  elif not options.project:
-    parser.error('Project name is missing.')
-  elif len(args) < 1:
-    parser.error('File to upload not provided.')
-  elif len(args) > 1:
-    parser.error('Only one file may be specified.')
-
-  file_path = args[0]
-
-  if options.labels:
-    labels = options.labels.split(',')
-  else:
-    labels = None
-
-  status, reason, url = upload_find_auth(file_path, options.project,
-                                         options.summary, labels,
-                                         options.user, options.password)
-  if url:
-    print 'The file was uploaded successfully.'
-    print 'URL: %s' % url
-    return 0
-  else:
-    print 'An error occurred. Your file was not uploaded.'
-    print 'Google Code upload server said: %s (%s)' % (reason, status)
-    return 1
-
-
-if __name__ == '__main__':
-  sys.exit(main())