Merge branch 'release/v1.7.4'

Makefile

@@ -28,7 +28,7 @@ ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS}
 bin/mongrel2: build/libm2.a src/mongrel2.o
 	$(CC) $(CFLAGS) src/mongrel2.o -o $@ $< $(LIBS)
 
-build/libm2.a: OPTFLAGS += -fPIC
+build/libm2.a: CFLAGS += -fPIC
 build/libm2.a: build ${LIB_OBJ}
 	ar rcs $@ ${LIB_OBJ}
 	ranlib $@
@@ -62,7 +62,7 @@ pristine: clean
 	${MAKE} -C tools/m2sh pristine
 
 .PHONY: tests
-tests: build/libm2.a tests/config.sqlite ${TESTS} test_filters filters config_modules
+tests: tests/config.sqlite ${TESTS} test_filters filters config_modules
 	sh ./tests/runtests.sh
 
 tests/config.sqlite: src/config/config.sql src/config/example.sql src/config/mimetypes.sql
@@ -84,13 +84,13 @@ check:
 m2sh: 
 	${MAKE} ${MAKEOPTS} -C tools/m2sh all
 
-test_filters: 
+test_filters: build/libm2.a
 	${MAKE} ${MAKEOPTS} -C tests/filters all
 
-filters: 
+filters: build/libm2.a
 	${MAKE} ${MAKEOPTS} -C tools/filters all
 
-config_modules: 
+config_modules: build/libm2.a
 	${MAKE} ${MAKEOPTS} -C tools/config_modules all
 
 install: all

README.md

@@ -32,13 +32,14 @@ Features
 Download
 --------
 
-Mongrel2 is now 1.7.3 as of *Sat Jun 11 22:13:23 PDT 2011*:
+Mongrel2 is now 1.7.4 as of *Tue Jun 21 09:16:15 PDT 2011*: 
 
-* [mongrel2-1.7.3.tar.bz2](http://mongrel2.org/static/downloads/mongrel2-1.7.3.tar.bz2) MD5: bb0f85fdd2bc7c83286be5335a10c743
+* [mongrel2-1.7.4.tar.bz2](http://mongrel2.org/static/downloads/mongrel2-1.7.4.tar.bz2) MD5: 
 
 Documentation
 -------------
 
-You can get documentation and read more about it at [mongrel2.org](http://mongrel2.org).
+There is a full manual available at [mongrel2.org](http://mongrel2.org/static/mongrel2-manual.html)
+covering every aspect of Mongrel2, with more as we write features.
 
 

docs/manual/Makefile

@@ -1,6 +1,6 @@
 JUNK_FILES=book-final.* *.aux *.log styles/*.aux
 SOURCE=book
-WEBSITE=$(USER)@mongrel2.org:deployment/files/static
+WEBSITE=$(USER)@mongrel2.org:/var/www/mongrel2.org/static/
 FINAL=book-final
 
 draft: book-final.dvi

docs/wiki/mongrel2.wiki

@@ -28,10 +28,10 @@ technologies. <img src="http://mongrel2.org/static/logo.png" align="right"></p>
 
 <h2><a name="download">Download</a></h2>
 
-<p>Mongrel2 is now 1.7.2 as of Fri Jun 10 08:36:14 PDT 2011</p>
+<p>Mongrel2 is now 1.7.4:</p>
 
 <ul>
-    <li><a href="/static/downloads/mongrel2-1.7.3.tar.bz2">mongrel2-1.7.3.tar.bz2</a></li>
+    <li><a href="/static/downloads/mongrel2-1.7.4.tar.bz2">mongrel2-1.7.4.tar.bz2</a></li>
 </ul>
 
 

examples/python/mongrel2/config/commands.py

@@ -502,7 +502,7 @@ def version_command():
     Prints out the version of your mongrel2 binary."
     """
 
-    print "Mongrel2/1.7.3"
+    print "Mongrel2/1.7.4"
 
 
 

examples/python/setup.py

@@ -10,7 +10,7 @@
     'url': 'http://pypi.python.org/pypi/mongrel2-python',
     'download_url': 'http://pypi.python.org/pypi/mongrel2-python',
     'author_email': 'zedshaw@zedshaw.com',
-    'version': '1.7.3',
+    'version': '1.7.4',
     'install_requires': ['nose', 'simplejson', 'pyrepl', 'storm'],
     'packages': ['mongrel2', 'mongrel2.config'],
     'package_data': {'mongrel2': ['sql/config.sql']},

src/adt/darray.c

@@ -1,3 +1,37 @@
+/**
+ *
+ * Copyright (c) 2010, Zed A. Shaw and Mongrel2 Project Contributors.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ * 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ * 
+ *     * Neither the name of the Mongrel2 Project, Zed A. Shaw, nor the names
+ *       of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written
+ *       permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "adt/darray.h"
 #include "mem/halloc.h"
 #include <assert.h>