Changeset 1680

Timestamp:

07/23/08 09:20:00 (6 months ago)

Author:

alo

Message:

Files:

cherokee/trunk/cherokee/connection.c

r1673	r1680
875	875	cherokee_connection_step (cherokee_connection_t *conn)
876	876	{
	877	ret_t ret;
877	878	ret_t step_ret = ret_ok;
878	879
…	…
910	911	/* Encode handler output.
911	912	*/
912		{
913		ret_t ret;
914
915		/* Encode
916		*/
917		switch (step_ret) {
918		case ret_eof:
919		case ret_eof_have_data:
920		ret = cherokee_encoder_flush (conn->encoder, &conn->buffer, &conn->encoder_buffer);
921		step_ret = (conn->encoder_buffer.len == 0) ? ret_eof : ret_eof_have_data;
922		break;
923		default:
924		ret = cherokee_encoder_encode (conn->encoder, &conn->buffer, &conn->encoder_buffer);
925		break;
926		}
927		if (ret < ret_ok) return ret;
928
929		/* Swap buffers
930		*/
931		cherokee_buffer_swap_buffers (&conn->buffer, &conn->encoder_buffer);
932		cherokee_buffer_clean (&conn->encoder_buffer);
933		}
	913	switch (step_ret) {
	914	case ret_eof:
	915	case ret_eof_have_data:
	916	ret = cherokee_encoder_flush (conn->encoder, &conn->buffer, &conn->encoder_buffer);
	917	step_ret = (conn->encoder_buffer.len == 0) ? ret_eof : ret_eof_have_data;
	918	break;
	919	default:
	920	ret = cherokee_encoder_encode (conn->encoder, &conn->buffer, &conn->encoder_buffer);
	921	break;
	922	}
	923	if (ret < ret_ok) return ret;
	924
	925	/* Swap buffers
	926	*/
	927	cherokee_buffer_swap_buffers (&conn->buffer, &conn->encoder_buffer);
	928	cherokee_buffer_clean (&conn->encoder_buffer);
934	929
935	930	return step_ret;

r1676	r1680
442	442
443	443	TRACE(ENTRIES, "Using iocache %d\n", use_io);
444
	444
445	445	if (use_io) {
446	446	ret = cherokee_iocache_autoget_fd (srv->iocache,
…	…
471	471	goto out;
472	472	}
	473
	474	/* Ensure the mmap content is ready
	475	*/
	476	if (io_entry->mmaped == NULL)
	477	use_io = false;
473	478	}
474	479