psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

idna_stringprep

This commit is contained in:
psyc://psyced.org/~lynX 2009-04-27 16:51:54 +02:00
parent 076c4491a5
commit 8723f5c1ef
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGESTODO
View File

@ -3929,3 +3929,7 @@ http/fetch
- minor api cleanups to serve a more generic job - minor api cleanups to serve a more generic job
library/dns library/dns
+ honor #define _flag_disable_trust_localhost + 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()

11
world/net/include/net.h
View File

@ -53,17 +53,18 @@
# define DEFAULT_CONTENT_TYPE "text/html; charset=" SYSTEM_CHARSET # define DEFAULT_CONTENT_TYPE "text/html; charset=" SYSTEM_CHARSET
#endif #endif
#if __EFUN_DEFINED__(stringprep) #if __EFUN_DEFINED__(idna_stringprep) && defined(DRIVER_PATH)
// stringprep needs utf8 arguments // stringprep needs utf8 arguments
// this results in lots of conversions some of which look like // this results in lots of conversions some of which look like
// system->utf­>system->utf. luckily UTF8 is our system charset. // system->utf­>system->utf. luckily UTF8 is our system charset.
// so FROM_UTF8 and TO_UTF8 are normally nullmacros (see above) // 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... // beware, these macros dont have error handling...
# define NODEPREP(s) FROM_UTF8(stringprep(TO_UTF8(s), STRINGPREP_XMPP_NODEPREP)) # define NODEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_XMPP_NODEPREP))
# define NAMEPREP(s) FROM_UTF8(stringprep(TO_UTF8(s), STRINGPREP_NAMEPREP)) # define NAMEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_NAMEPREP))
# define RESOURCEPREP(s) FROM_UTF8(stringprep(TO_UTF8(s), STRINGPREP_XMPP_RESOURCEPREP)) # define RESOURCEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_XMPP_RESOURCEPREP))
#else #else
# echo Warning: using lower_case instead of idna_stringprep!
# define NODEPREP(s) lower_case(s) # define NODEPREP(s) lower_case(s)
# define NAMEPREP(s) lower_case(s) # define NAMEPREP(s) lower_case(s)
# define RESOURCEPREP(s) (s) # define RESOURCEPREP(s) (s)