Mercurial > hg > nginx-ranges

comparison src/core/nginx.c @ 382:984bb0b1399b NGINX_0_7_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.3 *) Change: the "rss" extension MIME type has been changed to "application/rss+xml". *) Change: now the "gzip_vary" directive turned on issues a "Vary: Accept-Encoding" header line for uncompressed responses too. *) Feature: now the "rewrite" directive does a redirect automatically if the "https://" protocol is used. *) Bugfix: the "proxy_pass" directive did not work with the HTTPS protocol; the bug had appeared in 0.6.9.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Jun 2008 00:00:00 +0400
parents 820f6378fc00
children 12defd37f578
comparison
equal deleted inserted replaced
381:23d1555141d9 382:984bb0b1399b
824 return NGX_CONF_ERROR; 824 return NGX_CONF_ERROR;
825 } 825 }
826 826
827 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); 827 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT);
828 828
829 ccf->oldpid.data = ngx_palloc(cycle->pool, ccf->oldpid.len); 829 ccf->oldpid.data = ngx_pnalloc(cycle->pool, ccf->oldpid.len);
830 if (ccf->oldpid.data == NULL) { 830 if (ccf->oldpid.data == NULL) {
831 return NGX_CONF_ERROR; 831 return NGX_CONF_ERROR;
832 } 832 }
833 833
834 ngx_memcpy(ngx_cpymem(ccf->oldpid.data, ccf->pid.data, ccf->pid.len), 834 ngx_memcpy(ngx_cpymem(ccf->oldpid.data, ccf->pid.data, ccf->pid.len),
868 return NGX_CONF_ERROR; 868 return NGX_CONF_ERROR;
869 } 869 }
870 870
871 } else { 871 } else {
872 cycle->lock_file.len = ccf->lock_file.len + 1; 872 cycle->lock_file.len = ccf->lock_file.len + 1;
873 cycle->lock_file.data = ngx_palloc(cycle->pool, 873 cycle->lock_file.data = ngx_pnalloc(cycle->pool,
874 ccf->lock_file.len + sizeof(".accept")); 874 ccf->lock_file.len + sizeof(".accept"));
875 if (cycle->lock_file.data == NULL) { 875 if (cycle->lock_file.data == NULL) {
876 return NGX_CONF_ERROR; 876 return NGX_CONF_ERROR;
877 } 877 }
878 878