nginx-0.1.25-RELEASE importrelease-0.1.25

    *) Bugfix: nginx did run on Linux parisc.

    *) Feature: nginx now does not start under FreeBSD if the sysctl
       kern.ipc.somaxconn value is too big.

    *) Bugfix: if a request was internally redirected by the
       ngx_http_index_module module to the ngx_http_proxy_module or
       ngx_http_fastcgi_module modules, then the index file was not closed
       after request completion.

    *) Feature: the "proxy_pass" can be used in location with regular
       expression.

    *) Feature: the ngx_http_rewrite_filter_module module supports the
       condition like "if ($HTTP_USER_AGENT ~ MSIE)".

    *) Bugfix: nginx started too slow if the large number of addresses and
       text values were used in the "geo" directive.

    *) Change: a variable name must be declared as "$name" in the "geo"
       directive. The previous variant without "$" is still supported, but
       will be removed soon.

    *) Feature: the "%{VARIABLE}v" logging parameter.

    *) Feature: the "set $name value" directive.

    *) Bugfix: gcc 4.0 compatibility.

    *) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/imap/ngx_imap_parse.c b/src/imap/ngx_imap_parse.c
index 03951a60b..6c1c3e95a 100644
--- a/src/imap/ngx_imap_parse.c
+++ b/src/imap/ngx_imap_parse.c
@@ -122,7 +122,8 @@ ngx_int_t ngx_pop3_parse_command(ngx_imap_session_t *s)
             case ' ':
             case CR:
             case LF:
-                if (!(arg = ngx_array_push(&s->args))) {
+                arg = ngx_array_push(&s->args);
+                if (arg == NULL) {
                     return NGX_ERROR;
                 }
                 arg->len = p - 1 - s->arg_start;
@@ -169,7 +170,8 @@ ngx_int_t ngx_pop3_parse_command(ngx_imap_session_t *s)
 
     if (state == sw_done) {
         if (s->arg_start) {
-            if (!(arg = ngx_array_push(&s->args))) {
+            arg = ngx_array_push(&s->args);
+            if (arg == NULL) {
                 return NGX_ERROR;
             }
             arg->len = s->arg_end - s->arg_start;