Igor Sysoev ha scritto:
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):
Right, sorry.
I was using 0.5.31, and with 0.6.10 I have not tested this problem :).
#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; \
}
Uhm, but now if I use NGX_CONF_UNSET_PTR as default value, it will no
more works with older version, right?
Ok, not a big problem.
5 messages in ru.sysoev.nginxRe: [dev] change in ngx_conf_merge_pt...
