summaryrefslogtreecommitdiffhomepage
AgeCommit message (Expand)AuthorFilesLines
2012-07-02Merge of r4654, r4672, r4684, r4685, r4692: resolver changes.Maxim Dounin2-16/+21
2012-07-02Merge of r4671: support for IPv6 literals in proxy_pass and so on.Maxim Dounin1-7/+30
2012-07-02Merge of r4653: ngx_inet.c code reduction.Maxim Dounin1-19/+2
2012-07-02Merge of r4652: ssl without buffer should not set c->buffered.Maxim Dounin1-1/+0
2012-07-02Merge of r4651: proxy_cookie_* fix.Maxim Dounin1-1/+15
2012-07-02Merge of r4648, r4649, r4650: memory leak with $geoip_org.Maxim Dounin1-4/+15
2012-07-02Merge of r4647: xslt reuse.Maxim Dounin1-2/+2
2012-07-02Merge of r4646: jemalloc 3.0.0 compatibility.Maxim Dounin1-2/+2
2012-07-02Merge of r4644:Maxim Dounin1-1/+6
2012-07-02Merge of r4643:Maxim Dounin1-5/+0
2012-07-02Merge of r4642:Maxim Dounin1-2/+9
2012-06-29Merge of r4639, r4640: C++ fixes.Maxim Dounin3-5/+6
2012-06-29Merge of r4636, r4637, r4638: config sanity checks.Maxim Dounin5-4/+17
2012-06-26Merge of r4645: fixed warning during nginx.xs compilation.Maxim Dounin1-1/+1
2012-06-25Fixed misc/GNUmakefile to properly tag on stable-1.2 branch.Maxim Dounin1-1/+2
2012-06-25Version bump.Maxim Dounin2-3/+3
2012-06-25Retagged release-1.2.1 properly.Maxim Dounin1-0/+1
2012-06-05nginx-1.2.1-RELEASEMaxim Dounin1-0/+152
2012-06-05Merge of r4674, r4675, r4676: win32 fixes.Maxim Dounin3-39/+206
2012-06-05Merge of r4632: updated openssl used for win32 builds.Maxim Dounin1-1/+1
2012-06-04Merge of r4630: fixed c->sent with unbuffered ssl.Maxim Dounin1-0/+1
2012-06-04Merge of r4614, r4624-r4629, r4631: proxy recursive changes.Maxim Dounin8-231/+407
2012-06-04Merge of r4622, r4623: balancing changes.Maxim Dounin2-170/+73
2012-06-04Merge of r4621, r4641: filter_finalize fixes.Maxim Dounin1-1/+0
2012-06-04Merge of r4619: accept moderation on EMFILE/ENFILE.Maxim Dounin3-6/+48
2012-06-04Merge of r4618: rewrite escaping fix (ticket #162).Maxim Dounin1-1/+0
2012-06-04Merge of r4617: fastcgi padding fix.Maxim Dounin1-4/+23
2012-06-04Merge of r4616: r->state fix.Maxim Dounin3-0/+7
2012-06-04Merge of r4615: write handler reset in ngx_http_named_location().Maxim Dounin1-0/+1
2012-06-04Merge of r4613: removed surplus condition.Maxim Dounin1-8/+4
2012-06-04Merge of r4612: proper subrequest handling in various modules.Maxim Dounin4-4/+4
2012-06-04Merge of r4611, r4620: resolver fixes.Maxim Dounin1-2/+14
2012-06-04Version bump.Maxim Dounin2-3/+3
2012-04-26stable-1.2 branchMaxim Dounin0-0/+0
2012-04-23release-1.2.0 tagMaxim Dounin1-0/+1
2012-04-23nginx-1.2.0-RELEASErelease-1.2.0Maxim Dounin1-0/+40
2012-04-23Version bump.Maxim Dounin2-3/+3
2012-04-23Fix of "%f" format handling.Igor Sysoev1-16/+19
2012-04-23Update openssl used for win32 builds.Maxim Dounin1-1/+1
2012-04-23Proxy: added ctx checking to input filters.Maxim Dounin1-0/+18
2012-04-21Image filter: compare aspect ratio more accurately during crop.Maxim Dounin1-3/+1
2012-04-19Fixed segfault with try_files (ticket #152).Maxim Dounin1-1/+1
2012-04-18Fixed master exit if there is no events section (ticket #150).Maxim Dounin1-14/+21
2012-04-18Don't silently ignore the last line of configuration file thatRuslan Ermilov1-1/+1
2012-04-17Fixed ngx_readv_chain() to honor IOV_MAX (ticket #14).Maxim Dounin1-0/+8
2012-04-17IOV_MAX handling microoptimization.Maxim Dounin5-18/+44
2012-04-17Fixed loop in ngx_writev_chain() and ngx_solaris_sendfilev_chain().Maxim Dounin2-2/+2
2012-04-16Fixed log->action after ssl handshake.Maxim Dounin1-0/+2
2012-04-12Fixed grammar in error messages.Ruslan Ermilov12-44/+45
2012-04-12Version bump.Maxim Dounin2-3/+3