pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-05 02:33:14 +02:00
Code Activity

Various remote include fixes

Browse Source
This commit is contained in:
codemastr
2003-12-30 18:45:40 +00:00
parent 829a3c8a1f
commit 042ce07691
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+4
View File
@@ -2676,3 +2676,7 @@ seen. gmtime warning still there
- Added a ./curlinstall script to help with installing curl (Read INSTALL.REMOTEINC for
more information).
- Added code to make remote includes able to use SSL (HTTPS/FTPS) if SSL support is enabled
- Fixed a remote include bug with rehashing when no remote includes were loaded
- Fixed a remote include compile bug on Linux regarding url.h
- Fixed a remote include compile bug regarding ares (#0001458) reported by mustapha88
- Made the tmp/ directory cleaned up better
autoconf/aclocal.m4
Vendored
+1 -1
View File
@@ -57,7 +57,7 @@ AC_DEFUN(CHECK_LIBCURL,
dnl curl-7.11.0 and up will include the ares info, older versions do not
if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then
CURLLIBS="$CURLLIBS -L$enableval/ares -lares"
CURLLIBS="$CURLLIBS -lares"
fi
IRCDLIBS="$IRCDLIBS $CURLLIBS"
URL="url.o"
configure
Vendored
+1 -1
View File
@@ -9597,7 +9597,7 @@ if test "${enable_libcurl+set}" = set; then
CURLLIBS=`$enableval/bin/curl-config --libs`
if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then
CURLLIBS="$CURLLIBS -L$enableval/ares -lares"
CURLLIBS="$CURLLIBS -lares"
fi
IRCDLIBS="$IRCDLIBS $CURLLIBS"
URL="url.o"
curlinstall
+2
View File
@@ -45,6 +45,8 @@ CPPFLAGS="-I$HOME/ares/include" ./configure --prefix=$HOME/curl --disable-shared
cp -R $HOME/ares/lib ares
make && make install
cp $HOME/ares/lib/libares.a $HOME/curl/lib
cd $save_PWD
echo ""
src/Makefile
+1 -1
View File
@@ -250,7 +250,7 @@ extcmodes.o: extcmodes.c $(INCLUDES)
extbans.o: extbans.c $(INCLUDES)
$(CC) $(CFLAGS) -c extbans.c
url.o: url.c $(INCLUDES) include/url.h
url.o: url.c $(INCLUDES) ../include/url.h
$(CC) $(CFLAGS) -c url.c
# DO NOT DELETE THIS LINE -- make depend depends on it.
src/modules.c
+3 -6
View File
@@ -97,12 +97,9 @@ void DeleteTempModules(void)
while ((dir = readdir(fd)))
{
if (!match("*.so", dir->d_name))
{
strcpy(tempbuf, "tmp/");
strcat(tempbuf, dir->d_name);
remove(tempbuf);
}
strcpy(tempbuf, "tmp/");
strcat(tempbuf, dir->d_name);
remove(tempbuf);
}
closedir(fd);
#endif
src/s_conf.c
+4
View File
@@ -6978,6 +6978,7 @@ int rehash(aClient *cptr, aClient *sptr, int sig)
{
#ifdef USE_LIBCURL
ConfigItem_include *inc;
char found_remote = 0;
if (loop.ircd_rehashing)
{
if (!sig)
@@ -6997,10 +6998,13 @@ int rehash(aClient *cptr, aClient *sptr, int sig)
continue;
if (inc->flag.type & INCLUDE_NOTLOADED)
continue;
found_remote = 1;
stat(inc->file, &sb);
download_file_async(inc->url, sb.st_ctime, conf_download_complete);
inc->flag.type |= INCLUDE_DLQUEUED;
}
if (!found_remote)
return rehash_internal(cptr, sptr, sig);
return 0;
#else
return rehash_internal(cptr, sptr, sig);