mirror of
git://git.psyced.org/git/psyced
synced 2024-08-15 03:25:10 +00:00
idna_stringprep
This commit is contained in:
parent
076c4491a5
commit
8723f5c1ef
2 changed files with 10 additions and 5 deletions
|
@ -3929,3 +3929,7 @@ http/fetch
|
|||
- minor api cleanups to serve a more generic job
|
||||
library/dns
|
||||
+ honor #define _flag_disable_trust_localhost
|
||||
net/irc
|
||||
- bugfix from fippo concerning alias interpretation
|
||||
include/net.h
|
||||
- the efun has changed from stringprep() to idna_stringprep()
|
||||
|
|
|
@ -53,17 +53,18 @@
|
|||
# define DEFAULT_CONTENT_TYPE "text/html; charset=" SYSTEM_CHARSET
|
||||
#endif
|
||||
|
||||
#if __EFUN_DEFINED__(stringprep)
|
||||
#if __EFUN_DEFINED__(idna_stringprep) && defined(DRIVER_PATH)
|
||||
// stringprep needs utf8 arguments
|
||||
// this results in lots of conversions some of which look like
|
||||
// system->utf>system->utf. luckily UTF8 is our system charset.
|
||||
// so FROM_UTF8 and TO_UTF8 are normally nullmacros (see above)
|
||||
# include <idn.h>
|
||||
# include DRIVER_PATH "sys/idn.h"
|
||||
// beware, these macros dont have error handling...
|
||||
# define NODEPREP(s) FROM_UTF8(stringprep(TO_UTF8(s), STRINGPREP_XMPP_NODEPREP))
|
||||
# define NAMEPREP(s) FROM_UTF8(stringprep(TO_UTF8(s), STRINGPREP_NAMEPREP))
|
||||
# define RESOURCEPREP(s) FROM_UTF8(stringprep(TO_UTF8(s), STRINGPREP_XMPP_RESOURCEPREP))
|
||||
# define NODEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_XMPP_NODEPREP))
|
||||
# define NAMEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_NAMEPREP))
|
||||
# define RESOURCEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_XMPP_RESOURCEPREP))
|
||||
#else
|
||||
# echo Warning: using lower_case instead of idna_stringprep!
|
||||
# define NODEPREP(s) lower_case(s)
|
||||
# define NAMEPREP(s) lower_case(s)
|
||||
# define RESOURCEPREP(s) (s)
|
||||
|
|
Loading…
Reference in a new issue