6c648dd642
This is actually a fully functional build except: * All internal shared libraries are static linked to make sure there is no interference with ports (and to reduce build time). * It does not have the python/perl/etc plugin or API support. * By default, it installs as "svnlite" rather than "svn". * If WITH_SVN added in make.conf, you get "svn". * If WITHOUT_SVNLITE is in make.conf, this is completely disabled. To be absolutely clear, this is not intended for any use other than checking out freebsd source and committing, like we once did with cvs. It should be usable for small scale local repositories that don't need the python/perl plugin architecture.
115 lines
3.9 KiB
C
115 lines
3.9 KiB
C
/* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership.
|
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
* (the "License"); you may not use this file except in compliance with
|
|
* the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "apr_buckets.h"
|
|
|
|
static apr_status_t socket_bucket_read(apr_bucket *a, const char **str,
|
|
apr_size_t *len, apr_read_type_e block)
|
|
{
|
|
apr_socket_t *p = a->data;
|
|
char *buf;
|
|
apr_status_t rv;
|
|
apr_interval_time_t timeout;
|
|
|
|
if (block == APR_NONBLOCK_READ) {
|
|
apr_socket_timeout_get(p, &timeout);
|
|
apr_socket_timeout_set(p, 0);
|
|
}
|
|
|
|
*str = NULL;
|
|
*len = APR_BUCKET_BUFF_SIZE;
|
|
buf = apr_bucket_alloc(*len, a->list); /* XXX: check for failure? */
|
|
|
|
rv = apr_socket_recv(p, buf, len);
|
|
|
|
if (block == APR_NONBLOCK_READ) {
|
|
apr_socket_timeout_set(p, timeout);
|
|
}
|
|
|
|
if (rv != APR_SUCCESS && rv != APR_EOF) {
|
|
apr_bucket_free(buf);
|
|
return rv;
|
|
}
|
|
/*
|
|
* If there's more to read we have to keep the rest of the socket
|
|
* for later. XXX: Note that more complicated bucket types that
|
|
* refer to data not in memory and must therefore have a read()
|
|
* function similar to this one should be wary of copying this
|
|
* code because if they have a destroy function they probably
|
|
* want to migrate the bucket's subordinate structure from the
|
|
* old bucket to a raw new one and adjust it as appropriate,
|
|
* rather than destroying the old one and creating a completely
|
|
* new bucket.
|
|
*
|
|
* Even if there is nothing more to read, don't close the socket here
|
|
* as we have to use it to send any response :) We could shut it
|
|
* down for reading, but there is no benefit to doing so.
|
|
*/
|
|
if (*len > 0) {
|
|
apr_bucket_heap *h;
|
|
/* Change the current bucket to refer to what we read */
|
|
a = apr_bucket_heap_make(a, buf, *len, apr_bucket_free);
|
|
h = a->data;
|
|
h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
|
|
*str = buf;
|
|
APR_BUCKET_INSERT_AFTER(a, apr_bucket_socket_create(p, a->list));
|
|
}
|
|
else {
|
|
apr_bucket_free(buf);
|
|
a = apr_bucket_immortal_make(a, "", 0);
|
|
*str = a->data;
|
|
}
|
|
return APR_SUCCESS;
|
|
}
|
|
|
|
APU_DECLARE(apr_bucket *) apr_bucket_socket_make(apr_bucket *b, apr_socket_t *p)
|
|
{
|
|
/*
|
|
* XXX: We rely on a cleanup on some pool or other to actually
|
|
* destroy the socket. We should probably explicitly call apr to
|
|
* destroy it instead.
|
|
*
|
|
* Note that typically the socket is allocated from the connection pool
|
|
* so it will disappear when the connection is finished.
|
|
*/
|
|
b->type = &apr_bucket_type_socket;
|
|
b->length = (apr_size_t)(-1);
|
|
b->start = -1;
|
|
b->data = p;
|
|
|
|
return b;
|
|
}
|
|
|
|
APU_DECLARE(apr_bucket *) apr_bucket_socket_create(apr_socket_t *p,
|
|
apr_bucket_alloc_t *list)
|
|
{
|
|
apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
|
|
|
|
APR_BUCKET_INIT(b);
|
|
b->free = apr_bucket_free;
|
|
b->list = list;
|
|
return apr_bucket_socket_make(b, p);
|
|
}
|
|
|
|
APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_socket = {
|
|
"SOCKET", 5, APR_BUCKET_DATA,
|
|
apr_bucket_destroy_noop,
|
|
socket_bucket_read,
|
|
apr_bucket_setaside_notimpl,
|
|
apr_bucket_split_notimpl,
|
|
apr_bucket_copy_notimpl
|
|
};
|