Permalink
Commits on Feb 6, 2012
  1. release-1.0.12 tag

    git-svn-id: svn://svn.nginx.org/nginx/tags/release-1.0.12@4456 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 6, 2012
  2. nginx-1.0.12-RELEASE

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4455 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 6, 2012
  3. Updated libs used for win32 builds.

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4454 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 6, 2012
Commits on Feb 5, 2012
  1. Merge of r4422:

    Fixed error handling in ngx_event_connect_peer().
    
    Previously if ngx_add_event() failed a connection was freed two times (once
    in the ngx_event_connect_peer(), and again by a caller) as pc->connection was
    left set.  Fix is to always use ngx_close_connection() to close connection
    properly and set pc->connection to NULL on errors.
    
    Patch by Piotr Sikora.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4453 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  2. Merge of r4416:

    Fixed AIO error handling on FreeBSD.
    
    The aio_return() must be called regardless of the error returned by   
    aio_error().  Not calling it resulted in various problems up to segmentation
    faults (as AIO events are level-triggered and were reported again and again).
    
    Additionally, in "aio sendfile" case r->blocked was incremented in case of
    error returned from ngx_file_aio_read(), thus causing request hangs.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4452 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  3. Merge of r4406, r4413: copyrights updated.

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4451 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  4. Merge of r4405:

    Fixed division by zero exception in ngx_hash_init().
        
    The ngx_hash_init() function did not expect call with zero elements count,
    which caused FPE error on configs with an empty "types" block in http context
    and "types_hash_max_size" > 10000.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4450 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  5. Merge of r4404:

    Fixed sched_setaffinity(2) to correctly pass size.
    
    Second argument (cpusetsize) is size in bytes, not in bits.  Previously
    used constant 32 resulted in reading of uninitialized memory and caused   
    EINVAL to be returned on some Linux kernels.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4449 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  6. Merge of r4402:

    Fixed proxy_cache_use_stale in "no live upstreams" case.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4448 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  7. Merge of r4401, r4415:

    SSL changes:
    
    *) Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
    
       Support for TLSv1.1 and TLSv1.2 protocols was introduced in
       OpenSSL 1.0.1 (-beta1 was recently released).  This change makes it
       possible to disable these protocols and/or enable them without other
       protocols.
    
    *) Removed ENGINE_load_builtin_engines() call.
    
       It's already called by OPENSSL_config().  Calling it again causes
       some openssl engines (notably GOST) to corrupt memory, as they don't
       expect to be created more than once.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4447 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  8. Merge of r4398:

    Changed ngx_log_debugN() macros to verify the number of arguments
    when built with debugging.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4446 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  9. Merge of r4396:

    Some questionable optomizations flags for icc were removed
    in order to simplify support of its future versions.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4445 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  10. Merge of r4393: zlib license file include fixed.

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4444 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  11. Merge of r4384, r4385:

    Fixes for limit_rate:
    
    *) Fixed throughput problems with large limit_rate.
    
       Previous attempt to fix this was in r1658 (0.6.18), though that one
       wasn't enough (it was a noop).
    
    *) Fixed interaction of limit_rate and sendfile_max_chunk.
    
       It's possible that configured limit_rate will permit more bytes per
       single operation than sendfile_max_chunk.  To protect disk from
       takeover by a single client it is necessary to apply sendfile_max_chunk
       as a limit regardless of configured limit_rate.
    
       See here for report (in Russian):
       http://mailman.nginx.org/pipermail/nginx-ru/2010-March/032806.html
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4443 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  12. Merge of r4383, r4403:

    MP4 fixes:
    
    *) Fixed mp4 if first entry in stsc was skipped (ticket #72).
    
       If first entry in stsc atom was skipped, and seek was to chunk
       boundary, than first_chunk in the generated stsc table wasn't
       set to 1.
    
    *) Fixed handling of mp4 above 2G and 32bit offsets (ticket #84).
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4442 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  13. Merge of r4381, r4400:

    Fixed limit_conn_log_level/limit_req_log_level inheritance.  The
    directives did not work if there were no limit_conn/limit_req
    specified on the same level.
    
    The code for limit_conn is different in 1.0.x, conflict resolved
    manually.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4441 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  14. Merge of r4379: duplicate words removed.

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4440 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  15. Merge of r4375, r4382:

    SSI changes:
    
    *) The "if" command did not work inside the "block" command and
       produced parsing errors.
    
    *) Added regex captures support in the expression of the "if" command.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4439 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  16. Merge of r4372, r4373, r4374:

    SCGI fixes:
    
    *) Fixed incorrect use of r->http_version in scgi module.
    
       The r->http_version is a version of client's request, and modules    
       must not set it unless they are really willing to downgrade protocol
       version used for a response (i.e. to HTTP/0.9 if no response headers
       are available).  In neither case r->http_version may be upgraded.
    
       The former code downgraded response from HTTP/1.1 to HTTP/1.0 for no
       reason, causing various problems (see ticket #66).  It was also
       possible that HTTP/0.9 requests were upgraded to HTTP/1.0.
    
    *) Removed duplicate function declaration.
    
    *) Removed error if there is no Status header.
    
       The SCGI specification doesn't specify format of the response, and
       assuming CGI specs should be used there is no reason to complain.
       RFC 3875 explicitly states that "A Status header field is optional,
       and status 200 'OK' is assumed if it is omitted".
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4438 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  17. Merge of r4339, r4340, r4341:

    Cache fixes:
    
    *) Obsolete code removed.
    
       The ngx_http_cache() and ngx_http_no_cache_set_slot() functions
       were replaced in 0.8.46 and no longer used since then.
    
    *) Handling of cache files with long headers.
    
       There are two possible situations which can lead to this: response
       was cached with bigger proxy_buffer_size value (and nginx was
       restared since then, i.e. shared memory zone content was lost), or
       due to the race in the cache update code (see [1]) we've end up
       with fcn->body_start from a different response stored in shared
       memory zone.
    
    *) Only complain on long locked entries.
    
       There have been multiple reports of cases where a real locked entry
       was removed, resulting in a segmentation fault later in a worker
       which locked the entry.  It looks like default inactive timeout isn't
       enough in real life.
    
       For now just ignore such locked entries, and move them to the top of
       the inactive queue to allow processing of other entries.
    
    [1] http://mailman.nginx.org/pipermail/nginx-devel/2011-September/001287.html
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4437 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  18. Merge of r4338:

    Renamed some constants to improve readability, no functional changes.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4436 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  19. Merge r4336:

    Microoptimization of sendfile(2) usage under FreeBSD.
    
    FreeBSD kernel checks headers/trailers pointer against NULL, not
    corresponding count.  Passing NULL if there are no headers/trailers
    helps to avoid unneeded work in kernel, as well as unexpected 0 bytes   
    GIO in traces.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4435 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  20. Merge of r4335:

    Fixed: some of $sent_http_* variables might contain header entries
    which actually wasn't sent to a client.
    
    The ngx_http_variable_headers() and ngx_http_variable_unknown_header()
    functions did not ignore response header entries with zero "hash"
    field.
    
    Thanks to Yichun Zhang (agentzh).
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4434 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
  21. Merge of r4377: configure on Solaris fixed.

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4433 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 5, 2012
Commits on Feb 4, 2012
  1. Merge of r4327:

    Removed unused function ngx_regex_capture_count().  The function has
    been unused since r3326 (0.8.25).
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4432 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 4, 2012
  2. Merge of r4306, r4320:

    Protection from stale write events in epoll.
    
    Stale write event may happen if epoll_wait() reported both read and write
    events, and processing of the read event closed descriptor.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4431 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 4, 2012
  3. Merge of r4326:

    Fix for read_head with try_files and open_file_cache.
    
    The of.read_ahead wasn't set in try_files code path, causing read_ahead
    directive to be a nop if try_files and open_file_cache were used.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4430 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 4, 2012
  4. Version bump.

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4429 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Feb 4, 2012
Commits on Dec 15, 2011
  1. nginx-1.0.11-RELEASE

    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4369 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Dec 15, 2011
Commits on Dec 14, 2011
  1. Merge of r4315:

    Allowed add_header for proxied 206 replies.
    
    It was working for nginx's own 206 replies as they are seen as 200 in the
    headers filter module (range filter goes later in the headers filter chain),
    but not for proxied replies.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4368 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Dec 14, 2011
  2. Merge of r4313:

    Added escaping of double quotes in ngx_escape_html().
    
    Patch by Zaur Abasmirzoev.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4367 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Dec 14, 2011
  3. Merge of r4307:

    Fix of mp4 module seeking.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4366 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Dec 14, 2011
  4. Merge of r4305:

    Fixed segfault on ssl servers without cert with SNI (ticket #54).
    
    Non-default servers may not have ssl context created if there are no
    certificate defined.  Make sure to check if ssl context present before
    using it.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4365 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Dec 14, 2011
  5. Merge of r4298:

    Fixed flv header to match specification.
    
    Used "\x5" in 5th byte to claim presence of both audio and video.  Used
    previous tag size 0 in the beginning of the flv body (bytes 10 .. 13) as
    required by specification (see http://www.adobe.com/devnet/f4v.html).
    
    Patch by Piotr Sikora.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4364 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Dec 14, 2011
  6. Merge of r4295:

    Fixed incorrect counting the length of headers in a SCGI request.
    
    
    git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.0@4363 73f98a42-aea0-e011-b76d-00259023448c
    mdounin committed Dec 14, 2011