Mirrors/privacore-open-source-search-engine
1
0
Fork 1
mirror of https://github.com/privacore/open-source-search-engine.git synced 2025-07-15 02:36:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into testing

Browse Source
This commit is contained in:
mwells
2014-09-20 08:26:38 -06:00
parent b24071caee 77ead7819b
commit 8ca567e001
6 changed files with 19 additions and 10 deletions

4
Hostdb.h

@ -53,8 +53,8 @@ enum {
#define PFLAG_RECOVERYMODE 0x80
// added slow disk reads to it, 4 bytes (was 52)
// 24 bytes for the gbversion
#define MAX_PING_SIZE (44+4+4+24)
// 21 bytes for the gbversion (see getVersionSize())
#define MAX_PING_SIZE (44+4+4+21)
#define HT_GRUNT 0x01
#define HT_SPARE 0x02

8
Linkdb.cpp

@ -2022,7 +2022,13 @@ bool Msg25::gotLinkText ( Msg20Request *req ) { // LinkTextReply *linkText ) {
// sanity check, Xml::set() requires this...
if ( r&&r->size_rssItem > 0 && r->ptr_rssItem[r->size_rssItem-1]!=0 ) {
char *xx=NULL;*xx=0; }
log("admin: received corrupt rss item of size "
"%li not null terminated from linker %s",
r->size_rssItem,r->ptr_ubuf);
// ignore it for now
r->size_rssItem = 0;
r->ptr_rssItem = NULL;
}
// . if no link text, count as error
// . linkText->getLinkTextLen()

7
Makefile

@ -567,10 +567,11 @@ master-rpm:
# need to do 'apt-get intall dh-make'
# deb-master
master-deb:
git archive --format=tar --prefix=gb-1.13/ master > ../gb_1.13.orig.tar
# need to change in changelog too!! dont' forget!!!
git archive --format=tar --prefix=gb-1.14/ master > ../gb_1.14.orig.tar
rm -rf debian
# change "-p gb_1.0" to "-p gb_1.1" to update version for example
dh_make -e gigablast@mail.com -p gb_1.13 -f ../gb_1.13.orig.tar
dh_make -e gigablast@mail.com -p gb_1.14 -f ../gb_1.14.orig.tar
# zero this out, it is just filed with the .txt files erroneously and it'll
# try to automatiicaly install in /usr/docs/
rm debian/docs
@ -595,7 +596,7 @@ master-deb:
# upload den
scp gb*.deb gk268:/w/html/
# alien it
sudo alien --to-rpm gb_1.13-1_i386.deb
sudo alien --to-rpm gb_1.14-1_i386.deb
# upload rpm
scp gb*.rpm gk268:/w/html/

4
Msg22.cpp

@ -472,7 +472,9 @@ void handleRequest22 ( UdpSlot *slot , long netnice ) {
char *dom = getDomFast ( r->m_url , &dlen );
// bogus url?
if ( ! dom ) {
log("msg22: got bad url in request: %s",r->m_url);
log("msg22: got bad url in request: %s from "
"hostid %li for msg22 call ",
r->m_url,slot->m_host->m_hostId);
g_errno = EBADURL;
us->sendErrorReply ( slot , g_errno );
mdelete ( st , sizeof(State22) , "Msg22" );

2
Msg4.cpp

@ -1160,7 +1160,7 @@ void handleRequest4 ( UdpSlot *slot , long netnice ) {
// if we send back a g_errno then multicast retries forever
// so just absorb it!
log("msg4: got corrupted request from hostid %li "
"used=%li != %li=readBufSize",
"used=%li != %li=readBufSize msg4",
slot->m_host->m_hostId,
used,
readBufSize);

4
changelog

@ -1,5 +1,5 @@
gb (1.13-1) unstable; urgency=low
gb (1.14-1) unstable; urgency=low
* More bug fixes.
-- mwells <gigablast@mail.com> Tue, 28 Aug 2014 21:38:35 -0700
-- mwells <gigablast@mail.com> Tue, 19 Sep 2014 21:38:35 -0700