Bug #3668 » wt-3.3.4-rc1-disable-boost-regex.patch
| cmake/WtFindBoost-cmake.txt | ||
|---|---|---|
|
# Separate compiled boost libraries are also discovered:
|
||
|
# - BOOST_DT_LIB
|
||
|
# - BOOST_FS_LIB
|
||
|
# - BOOST_REGEX_LIB
|
||
|
# - BOOST_PO_LIB
|
||
|
# - BOOST_SIGNALS_LIB
|
||
|
# - BOOST_SYSTEM_LIB
|
||
| ... | ... | |
|
SET(Boost_COMPONENTS
|
||
|
date_time
|
||
|
regex
|
||
|
program_options
|
||
|
signals
|
||
|
system
|
||
| ... | ... | |
|
SET(BOOST_LIB_DIRS ${Boost_LIBRARY_DIRS})
|
||
|
SET(BOOST_DT_LIB ${Boost_DATE_TIME_LIBRARY})
|
||
|
SET(BOOST_FS_LIB ${Boost_FILESYSTEM_LIBRARY})
|
||
|
SET(BOOST_REGEX_LIB ${Boost_REGEX_LIBRARY})
|
||
|
SET(BOOST_PO_LIB ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
||
|
SET(BOOST_SIGNALS_LIB ${Boost_SIGNALS_LIBRARY})
|
||
|
SET(BOOST_SYSTEM_LIB ${Boost_SYSTEM_LIBRARY})
|
||
| ... | ... | |
|
SET(BOOST_WT_LIBRARIES
|
||
|
${Boost_THREAD_LIBRARY}
|
||
|
${BOOST_RANDOM_LIB}
|
||
|
${Boost_REGEX_LIBRARY}
|
||
|
${Boost_SIGNALS_LIBRARY}
|
||
|
${Boost_SYSTEM_LIBRARY}
|
||
|
${Boost_FILESYSTEM_LIBRARY}
|
||
|
-- a/src/web/WebController.C 2014-10-23 09:20:34.720908680 +0000
|
||
|
++ b/src/web/WebController.C 2014-11-17 14:05:33.536663135 +0000
|
||
| ... | ... | |
|
regex_t cookieSession_e;
|
||
|
regcomp(&cookieSession_e, cookieSession_ep.c_str(), 0);
|
||
|
regmatch_t pmatch[2];
|
||
|
int res = regexec(&cookieSession_e, cookies.c_str(), 2, pmatch, 0);
|
||
|
int res = regexec(&cookieSession_e, cookies, 2, pmatch, 0);
|
||
|
regfree(&cookieSession_e);
|
||
|
if (res == 0) {
|
||
|
return cookies.substr(pmatch[1].rm_so,
|
||
|
pmatch[1].rm_eo - pmatch[1].rm_so);
|
||
|
return std::string(cookies + pmatch[1].rm_so,
|
||
|
pmatch[1].rm_eo - pmatch[1].rm_so);
|
||
|
} else
|
||
|
return std::string();
|
||
|
#endif
|
||