upload http

JIRA: BOTTLENECK-10

Change-Id: I7598427ff904df438ce77c2819ee48ac75ffa8da
Signed-off-by: hongbotian <hongbo.tianhongbo@huawei.com>

6 files changed, 106 insertions, 0 deletions

diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/.libs/waitio.o b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/.libs/waitio.o
new file mode 100644
index 00000000..6ead1cd2
--- /dev/null
+++ b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/.libs/waitio.o
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile
new file mode 100644
index 00000000..45df847a
--- /dev/null
+++ b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile
@@ -0,0 +1,15 @@
+srcdir = .
+
+
+TARGETS = \
+	waitio.lo 
+
+# bring in rules.mk for standard functionality
+include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
+
+INCDIR=../../include
+OSDIR=$(INCDIR)/arch/unix
+DEFOSDIR=$(INCDIR)/arch/unix
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+
+# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile.in
new file mode 100644
index 00000000..190cacfc
--- /dev/null
+++ b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile.in
@@ -0,0 +1,15 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+TARGETS = \
+	waitio.lo 
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
+INCDIR=../../include
+OSDIR=$(INCDIR)/arch/@OSDIR@
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
+
+# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.c b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.c
new file mode 100644
index 00000000..774e923e
--- /dev/null
+++ b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.c
@@ -0,0 +1,64 @@
+/* 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_arch_file_io.h"
+#include "apr_arch_networkio.h"
+#include "apr_poll.h"
+#include "apr_errno.h"
+#include "apr_support.h"
+
+/* The only case where we don't use wait_for_io_or_timeout is on
+ * pre-BONE BeOS, so this check should be sufficient and simpler */
+#if !BEOS_R5
+#define USE_WAIT_FOR_IO
+#endif
+
+#ifdef USE_WAIT_FOR_IO
+apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s,
+                                           int for_read)
+{
+    apr_interval_time_t timeout;
+    apr_pollfd_t pollset;
+    int srv, n;
+    int type = for_read ? APR_POLLIN : APR_POLLOUT;
+
+    /* TODO - timeout should be less each time through this loop */
+    if (f) {
+        pollset.desc_type = APR_POLL_FILE;
+        pollset.desc.f = f;
+        pollset.p = f->pool;
+        timeout = f->timeout;
+    }
+    else {
+        pollset.desc_type = APR_POLL_SOCKET;
+        pollset.desc.s = s;
+        pollset.p = s->cntxt;
+        timeout = s->timeout;
+    }
+    pollset.reqevents = type;
+
+    do {
+        srv = apr_poll(&pollset, 1, &n, timeout);
+
+        if (n == 1 && pollset.rtnevents & type) {
+            return APR_SUCCESS;
+        }
+    } while (APR_STATUS_IS_EINTR(srv));
+
+    return srv;
+}
+#endif
+
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.lo b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.lo
new file mode 100644
index 00000000..2d94669b
--- /dev/null
+++ b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.lo
@@ -0,0 +1,12 @@
+# waitio.lo - a libtool object file
+# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object='.libs/waitio.o'
+
+# Name of the non-PIC object.
+non_pic_object='waitio.o'
+
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.o b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.o
new file mode 100644
index 00000000..8e28ef25
--- /dev/null
+++ b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.o