--- parser3/src/main/pa_common.C 2003/03/26 18:52:50 1.143.2.21.2.16 +++ parser3/src/main/pa_common.C 2003/04/01 16:16:23 1.143.2.21.2.19 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_COMMON_C="$Date: 2003/03/26 18:52:50 $"; +static const char* IDENT_COMMON_C="$Date: 2003/04/01 16:16:23 $"; #include "pa_common.h" #include "pa_exception.h" @@ -61,7 +61,10 @@ int PASCAL closesocket(SOCKET); #endif // locking constants -#ifdef LATER +//#define PA_DEBUG_NO_LOCKING + +#ifdef PA_DEBUG_NO_LOCKING + #ifdef HAVE_FLOCK static int lock_shared_blocking(int fd) { return flock(fd, LOCK_SH); } @@ -203,7 +206,7 @@ static int http_read_response(String& re ssize_t size=recv(sock, buf, MAX_STRING, 0); if(size<=0) break; - response.append(buf, size, String::L_TAINTED); + response.append_strdup(buf, size, String::L_TAINTED); if(!result && (EOLat=response.pos("\r\n", 2))!=STRING_NOT_FOUND) { // checking status in first response const String& status_line=response.mid(0, (size_t)EOLat); ArrayString astatus; @@ -483,11 +486,11 @@ File_read_result file_read(Charset& char #ifdef PA_HTTP if(file_spec.starts_with("http://")) { // fail on read problem - File_read_http_result http=file_read_http(charset, file_spec, params); + File_read_http_result http;//=file_read_http(charset, file_spec, params); result.success=true; - result.str=http.str; - result.length=http.length; - result.headers=http.headers; + result.str="HELLO";//http.str; + result.length=5;//http.length; + result.headers=new HashStringValue;//http.headers; } else { #endif File_read_action_info info={&result.str, &result.length};