Changeset 5730:bffff5f70163 in roaraudio

Timestamp:

11/07/12 01:10:52 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support index files

File:

• plugins/universal/protocol-http.c (modified) (5 diffs)

plugins/universal/protocol-http.c

@@ -410 +410 @@
  void * data;
  ssize_t ret;
+ int err;
 
  // TODO: use content type for some basic filtering.
@@ -420 +421 @@
 
  ret = roar_vio_read(self->input.vio, data, len);
+ err = roar_error;
 
  if ( ret < 1 ) {
   roar_buffer_free(buffer);
-  return 0;
+  roar_error = err;
+  return -1;
  }
 
@@ -442 +445 @@
 
 static int __res_vio_header_send(struct http_client * self, struct roar_buffer ** obuffer) {
+ static const char * index_files[] = {NULL, "index.html", "index.txt", "index"};
  struct roar_buffer * buffer;
  struct roar_keyval * path;
@@ -447 +451 @@
  const char * slash = "/";
  const char * content_type = NULL;
+ int uste_check;
+ size_t i;
 
  if ( self->pluginpara == NULL ) {
@@ -478 +484 @@
   slash = "";
 
- snprintf(filename, sizeof(filename), "%s%s%s", path->value, slash, self->path);
-
-
- self->input.vio = &(self->input.vio_store);
- if ( roar_vio_open_dstr_simple(self->input.vio, filename, ROAR_VIOF_READ|ROAR_VIOF_NONBLOCK) == -1 ) {
-  return -1;
- }
-
- if ( roar_vio_ctl(self->input.vio, ROAR_VIO_CTL_GET_MIMETYPE, &content_type) == -1 )
-  content_type = NULL;
-
- if ( content_type == NULL )
-  content_type = __res_vio_content_type_get(self);
-
- if ( __res_vio_check_uste(self, &buffer, content_type) == 1 ) {
+ uste_check = -1;
+ for (i = 0; uste_check == -1 && i < (sizeof(index_files)/sizeof(*index_files)); i++) {
+  snprintf(filename, sizeof(filename), "%s%s%s%s%s", path->value, slash, self->path,
+           index_files[i] == NULL ? "" : "/",
+           index_files[i] == NULL ? "" : index_files[i]);
+
+
+  self->input.vio = &(self->input.vio_store);
+  if ( roar_vio_open_dstr_simple(self->input.vio, filename, ROAR_VIOF_READ|ROAR_VIOF_NONBLOCK) == -1 ) {
+   continue;
+  }
+
+  if ( roar_vio_ctl(self->input.vio, ROAR_VIO_CTL_GET_MIMETYPE, &content_type) == -1 )
+   content_type = NULL;
+
+  if ( content_type == NULL )
+   content_type = __res_vio_content_type_get(self);
+
+  uste_check = __res_vio_check_uste(self, &buffer, content_type);
+  if ( uste_check == -1 )
+   roar_vio_unref(self->input.vio);
+ }
+
+ if ( uste_check == -1 )
+  return -1;
+
+ if ( uste_check == 1 ) {
   if ( buffer != NULL )
    roar_buffer_free(buffer);