Merge branch 'release/v1.7.5'

README.md

@@ -32,9 +32,9 @@ Features
 Download
 --------
 
-Mongrel2 is now 1.7.4 as of *Tue Jun 21 09:16:15 PDT 2011*: 
+Mongrel2 is now 1.7.5 as of *Wed Jun 22 09:23:16 PDT 2011*: 
 
-* [mongrel2-1.7.4.tar.bz2](http://mongrel2.org/static/downloads/mongrel2-1.7.4.tar.bz2) MD5: a01d1cab2132b44a01837f254ecfb296
+* [mongrel2-1.7.5.tar.bz2](http://mongrel2.org/static/downloads/mongrel2-1.7.5.tar.bz2) MD5: 
 
 Documentation
 -------------

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.4:</p>
+<p>Mongrel2 is now 1.7.5:</p>
 
 <ul>
-    <li><a href="/static/downloads/mongrel2-1.7.4.tar.bz2">mongrel2-1.7.4.tar.bz2</a></li>
+    <li><a href="/static/downloads/mongrel2-1.7.5.tar.bz2">mongrel2-1.7.5.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.4"
+    print "Mongrel2/1.7.5"
 
 
 

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.4',
+    'version': '1.7.5',
     'install_requires': ['nose', 'simplejson', 'pyrepl', 'storm'],
     'packages': ['mongrel2', 'mongrel2.config'],
     'package_data': {'mongrel2': ['sql/config.sql']},

src/io.c

@@ -441,7 +441,7 @@ char *IOBuf_read_all(IOBuf *buf, int len, int retries)
     debug("ATTEMPTS: %d, RETRIES: %d", attempts, retries);
 
     if(attempts > retries) {
-        log_err("Read of %d length attempted %d times which is over %d retry limit..", len, attempts, retries);
+        log_warn("Read of %d length attempted %d times which is over %d retry limit..", len, attempts, retries);
     }
 
     check(IOBuf_read_commit(buf, len) != -1, "Final commit failed of read_all.");

src/upload.c

@@ -125,7 +125,7 @@ int Upload_file(Connection *conn, Handler *handler, int content_len)
     return 0;
 
 error:
-    bdestroy(result);
+    if(result) bdestroy(result);
     fdclose(tmpfd);
 
     if(tmp_name != NULL) {

src/version.h

@@ -1,3 +1,3 @@
-#define VERSION "Mongrel2/1.7.4"
+#define VERSION "Mongrel2/1.7.5"