ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed regexps for no content length and single images. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@984 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2004-03-19 10:09:05 +00:00
parent 68b61739c1
commit 899c9999d4
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/zm_remote_camera.cpp
View File

@ -271,7 +271,7 @@ int RemoteCamera::GetResponse()
return( -1 ); return( -1 );
} }
if ( !header_expr ) if ( !header_expr )
header_expr = new RegExpr( "^(.+?\r?\n)(?=\r?\n)", PCRE_DOTALL ); header_expr = new RegExpr( "^(.+?\r?\n\r?\n)", PCRE_DOTALL );
if ( header_expr->Match( (char*)buffer, buffer.Size() ) == 2 ) if ( header_expr->Match( (char*)buffer, buffer.Size() ) == 2 )
{ {
header = header_expr->MatchString( 1 ); header = header_expr->MatchString( 1 );
@ -369,7 +369,7 @@ int RemoteCamera::GetResponse()
if ( !subheader_expr ) if ( !subheader_expr )
{ {
char subheader_pattern[256] = ""; char subheader_pattern[256] = "";
sprintf( subheader_pattern, "^((?:\r?\n)?\r?\n(?:--)?%s\r?\n.+?\r?\n\r?\n)", content_boundary ); sprintf( subheader_pattern, "^((?:\r?\n\r?\n)?(?:--)?%s\r?\n.+?\r?\n\r?\n)", content_boundary );
subheader_expr = new RegExpr( subheader_pattern, PCRE_MULTILINE|PCRE_DOTALL ); subheader_expr = new RegExpr( subheader_pattern, PCRE_MULTILINE|PCRE_DOTALL );
} }
if ( subheader_expr->Match( (char *)buffer, (int)buffer ) == 2 ) if ( subheader_expr->Match( (char *)buffer, (int)buffer ) == 2 )
@ -416,15 +416,52 @@ int RemoteCamera::GetResponse()
return( -1 ); return( -1 );
} }
while ( buffer.Size() < content_length ) if ( content_length )
{ {
int buffer_len = ReadData( buffer ); while ( buffer.Size() < content_length )
if ( buffer_len < 0 )
{ {
return( -1 ); int buffer_len = ReadData( buffer );
if ( buffer_len < 0 )
{
return( -1 );
}
}
}
else
{
while ( !content_length )
{
int buffer_len = ReadData( buffer );
if ( buffer_len < 0 )
{
return( -1 );
}
static RegExpr *content_expr = 0;
if ( mode == SINGLE_JPEG )
{
static RegExpr *single_jpeg_expr = 0;
if ( !content_expr )
{
content_expr = new RegExpr( "^(.+?)\r?\n\r?\n$", PCRE_MULTILINE|PCRE_DOTALL );
}
}
else
{
static RegExpr *multi_jpeg_expr = 0;
if ( !content_expr )
{
char content_pattern[256] = "";
sprintf( content_pattern, "^(.+?)\r?\n\r?\n(?:--)?%s\r?\n", content_boundary );
content_expr = new RegExpr( content_pattern, PCRE_MULTILINE|PCRE_DOTALL );
}
}
if ( content_expr->Match( buffer, buffer.Size() ) == 2 )
{
content_length = content_expr->MatchLength( 1 );
Debug( 3, ( "Got end of image, content-length = %d", content_length ));
}
} }
} }
if ( mode == SINGLE_JPEG ) if ( mode == SINGLE_JPEG )
{ {
state = HEADER; state = HEADER;