Forks/open-source-search-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into testing

Browse Source
This commit is contained in:
Matt
2015-11-19 16:11:38 -07:00
parent 87af33db66 7783c4655e
commit eb57f0a8c3
2 changed files with 6 additions and 2 deletions

2
Mem.cpp

@ -1718,7 +1718,7 @@ void Mem::gbfree ( void *ptr , int size , const char *note ) {
int32_t slot = g_mem.getMemSlot ( ptr );
if ( slot < 0 ) {
log(LOG_LOGIC,"mem: could not find slot (note=%s)",note);
log(LOG_LOGIC,"mem: FIXME!!!");
//log(LOG_LOGIC,"mem: FIXME!!!");
// return for now so procog does not core all the time!
return;
//char *xx = NULL; *xx = 0;

4
PageRoot.cpp

@ -2525,6 +2525,10 @@ bool sendPageAddUrl ( TcpSocket *sock , HttpRequest *hr ) {
if ( ! ir->ptr_url ) ir->ptr_url = hr->getString("url",NULL);
if ( ! ir->ptr_url ) ir->ptr_url = hr->getString("urls",NULL);
if ( ir->ptr_url ) {
ir->size_url = gbstrlen(ir->ptr_url) + 1;
}
// get back a short reply so we can show the status code easily
ir->m_shortReply = 1;