RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: WURFL: fixed Engine load failed error when wurfl-information-list contains wurfl_root_id

This commit is contained in:
mbellomi 2019-05-21 15:51:46 +02:00 committed by Willy Tarreau
parent e30e3001d9
commit f9ea1e2fd4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wurfl.c
View File

@ -102,9 +102,9 @@ static const struct {
{"wurfl_isdevroot", ha_wurfl_get_wurfl_isdevroot}, {"wurfl_isdevroot", ha_wurfl_get_wurfl_isdevroot},
{"wurfl_last_load_time", ha_wurfl_get_wurfl_last_load_time}, {"wurfl_last_load_time", ha_wurfl_get_wurfl_last_load_time},
{"wurfl_normalized_useragent", ha_wurfl_get_wurfl_normalized_useragent}, {"wurfl_normalized_useragent", ha_wurfl_get_wurfl_normalized_useragent},
{"wurfl_root_id", ha_wurfl_get_wurfl_root_id},
{"wurfl_useragent", ha_wurfl_get_wurfl_useragent}, {"wurfl_useragent", ha_wurfl_get_wurfl_useragent},
{"wurfl_useragent_priority", ha_wurfl_get_wurfl_useragent_priority }, // kept for backward conf file compat {"wurfl_useragent_priority", ha_wurfl_get_wurfl_useragent_priority }, // kept for backward conf file compat
{"wurfl_root_id", ha_wurfl_get_wurfl_root_id},
}; };
static const int HA_WURFL_PROPERTIES_NBR = 10; static const int HA_WURFL_PROPERTIES_NBR = 10;
@ -602,7 +602,10 @@ INITCALL1(STG_REGISTER, sample_register_convs, &conv_kws);
// WURFL properties wrapper functions // WURFL properties wrapper functions
static const char *ha_wurfl_get_wurfl_root_id (wurfl_handle wHandle, wurfl_device_handle dHandle) static const char *ha_wurfl_get_wurfl_root_id (wurfl_handle wHandle, wurfl_device_handle dHandle)
{ {
return wurfl_device_get_root_id(dHandle); if (wurfl_device_get_root_id(dHandle))
return wurfl_device_get_root_id(dHandle);
else
return "";
} }
static const char *ha_wurfl_get_wurfl_id (wurfl_handle wHandle, wurfl_device_handle dHandle) static const char *ha_wurfl_get_wurfl_id (wurfl_handle wHandle, wurfl_device_handle dHandle)