ObjFW  Check-in [e3de40a9b9]

Overview
Comment:OFHTTPClient: Fix missing exception handling
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e3de40a9b90b42250ac516bc13a9bc4872577c037af0cbb3150c9f1f37397054
User & Date: js on 2017-10-07 15:19:19
Other Links: manifest | tags
Context
2017-10-11
20:53
Fix shadowed variables and enable -Wshadow check-in: 00476e4430 user: js tags: trunk
2017-10-07
15:19
OFHTTPClient: Fix missing exception handling check-in: e3de40a9b9 user: js tags: trunk
15:12
OFThread: Fix setting the name on the wrong thread check-in: c211f691e7 user: js tags: trunk
Changes

Modified src/OFHTTPClient.m from [dadb6a38d3] to [3385dc4745].

538
539
540
541
542
543
544
545
546
547
548
549
550
551
552

	if (exception != nil) {
		if ([exception isKindOfClass: [OFWriteFailedException class]] &&
		    ([exception errNo] == ECONNRESET ||
		    [exception errNo] == EPIPE)) {
			/* In case a keep-alive connection timed out */
			[self closeAndReconnect];
			return false;
		}

		[_client->_delegate client: _client
		     didEncounterException: exception
				forRequest: _request
				   context: _context];
		return 0;







|







538
539
540
541
542
543
544
545
546
547
548
549
550
551
552

	if (exception != nil) {
		if ([exception isKindOfClass: [OFWriteFailedException class]] &&
		    ([exception errNo] == ECONNRESET ||
		    [exception errNo] == EPIPE)) {
			/* In case a keep-alive connection timed out */
			[self closeAndReconnect];
			return 0;
		}

		[_client->_delegate client: _client
		     didEncounterException: exception
				forRequest: _request
				   context: _context];
		return 0;
603
604
605
606
607
608
609








610
611
612
613
614
615
616
	}
}

- (void)socketDidConnect: (OFTCPSocket *)socket
		 context: (id)context
	       exception: (id)exception
{








	if ([_client->_delegate respondsToSelector:
	    @selector(client:didCreateSocket:forRequest:context:)])
		[_client->_delegate client: _client
			   didCreateSocket: socket
				forRequest: _request
				   context: _context];








>
>
>
>
>
>
>
>







603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
	}
}

- (void)socketDidConnect: (OFTCPSocket *)socket
		 context: (id)context
	       exception: (id)exception
{
	if (exception != nil) {
		[_client->_delegate client: _client
		     didEncounterException: exception
				forRequest: _request
				   context: _context];
		return;
	}

	if ([_client->_delegate respondsToSelector:
	    @selector(client:didCreateSocket:forRequest:context:)])
		[_client->_delegate client: _client
			   didCreateSocket: socket
				forRequest: _request
				   context: _context];