ObjFW  Diff

Differences From Artifact [bee61430ab]:

To Artifact [f2e30645b9]:


418
419
420
421
422
423
424
425
426
427




428
429
430
431
432
433
434
418
419
420
421
422
423
424



425
426
427
428
429
430
431
432
433
434
435







-
-
-
+
+
+
+







- (BOOL)sendErrorAndClose: (short)statusCode
{
	OFString *date = [[OFDate date]
	    dateStringWithFormat: @"%a, %d %b %Y %H:%M:%S GMT"];

	[sock writeFormat: @"HTTP/1.1 %d %s\r\n"
			   @"Date: %@\r\n"
			   @"Server: OFHTTPServer (ObjFW's HTTP server class, "
			   @"<https://webkeks.org/objfw/>)\r\n\r\n",
			   statusCode, status_code_to_string(statusCode), date];
			   @"Server: %@\r\n"
			   @"\r\n",
			   statusCode, status_code_to_string(statusCode), date,
			   [server name]];
	[sock close];

	return NO;
}

- (void)sendReply
{
471
472
473
474
475
476
477
478

479
480
481


482
483
484
485
486
487
488
472
473
474
475
476
477
478

479

480

481
482
483
484
485
486
487
488
489







-
+
-

-
+
+







			      selector: @selector(server:didReceiveRequest:)];
	}

	replyHeaders = [reply headers];
	replyData = [reply data];

	[sock writeFormat: @"HTTP/1.1 %d %s\r\n"
			   @"Server: OFHTTPServer (ObjFW's HTTP server class, "
			   @"Server: %@\r\n",
			   @"<https://webkeks.org/objfw/>)\r\n",
			   [reply statusCode],
			   status_code_to_string([reply statusCode])];
			   status_code_to_string([reply statusCode]),
			   [server name]];

	if (requestType != OF_HTTP_REQUEST_TYPE_HEAD)
		[sock writeFormat: @"Content-Length: %zu\r\n",
				   [replyData count] * [replyData itemSize]];

	keyEnumerator = [replyHeaders keyEnumerator];
	valueEnumerator = [replyHeaders objectEnumerator];
499
500
501
502
503
504
505










506
507
508
509
510

511
512
513
514
515
516
517
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529







+
+
+
+
+
+
+
+
+
+





+







@end

@implementation OFHTTPServer
+ (instancetype)server
{
	return [[[self alloc] init] autorelease];
}

- init
{
	self = [super init];

	name = @"OFHTTPServer (ObjFW's HTTP server class "
	    @"<https://webkeks.org/objfw/>)";

	return self;
}

- (void)dealloc
{
	[host release];
	[listeningSocket release];
	[name release];

	[super dealloc];
}

- (void)setHost: (OFString*)host_
{
	OF_SETTER(host, host_, YES, 1)
537
538
539
540
541
542
543










544
545
546
547
548
549
550
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572







+
+
+
+
+
+
+
+
+
+







	delegate = delegate_;
}

- (id <OFHTTPServerDelegate>)delegate
{
	return delegate;
}

- (void)setName: (OFString*)name_
{
	OF_SETTER(name, name_, YES, 1)
}

- (OFString*)name
{
	OF_GETTER(name, YES)
}

- (void)start
{
	if (host == nil || port == 0)
		@throw [OFInvalidArgumentException
		    exceptionWithClass: [self class]
			      selector: _cmd];