5 messages in ru.sysoev.nginxRe: [dev] change in ngx_conf_merge_pt...
FromSent OnAttachments
Manlio PerilloNov 24, 2007 9:25 am 
Igor SysoevNov 24, 2007 9:43 am 
Manlio PerilloNov 24, 2007 10:29 am 
Manlio PerilloNov 25, 2007 9:20 am 
Manlio PerilloNov 25, 2007 9:48 am 
Actions with this message:
Paste this link in email or IM:
Paste this link in email or IM:
Atom feed for this thread
Paste this URL into your reader:
Subject:Re: [dev] change in ngx_conf_merge_ptr_value for 0.5.33Actions...
From:Igor Sysoev (is-G@public.gmane.org)
Date:Nov 24, 2007 9:43:18 am
List:ru.sysoev.nginx

On Sat, Nov 24, 2007 at 06:26:02PM +0100, Manlio Perillo wrote:

Igor, do you have made some changes in the ngx_conf_merge_ptr_value function?

In mod_wsgi I have: ngx_conf_merge_ptr_value(conf->callable_object, prev->callable_object, "application");

for directive wsgi_application_callable.

With 0.5.32 and 0.6.16, when the directive is not supplied, its value is "application".

With 0.5.33 it is NULL.

conf->callable_object is a char *.

Yes, it was changed (however, svn log says it was in 0.5.32 and 0.6.10):

#define ngx_conf_merge_ptr_value(conf, prev, default) \ - if (conf == NULL) { \ - conf = (prev == NULL) ? default : prev; \ + if (conf == NGX_CONF_UNSET_PTR) { \ + conf = (prev == NGX_CONF_UNSET_PTR) ? default : prev; \ }

-- Igor Sysoev http://sysoev.ru/en/