Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

htroot/IndexReIndexMonitor_p.html

@@ -17,7 +17,7 @@
                     <tr>
                         <td>Documents in current queue</td>
                         <td>#[querysize]#</td>
-                        <td>#(reindexjobrunning)#::<input type="submit" value="refresh page"/>#(/reindexjobrunning)#</td>
+                        <td>#(reindexjobrunning)#::<input type="submit" value="refresh page" class="btn btn-primary"/>#(/reindexjobrunning)#</td>
                     </tr>
                     <tr>
                         <td>Documents processed</td>
@@ -36,8 +36,8 @@
                     </tr>                    
                 </table>
                 #(reindexjobrunning)#                
-                <input type="submit" name="reindexnow" value="start reindex job now"/>
-                ::<input type="submit" name="stopreindex" value="stop reindexing"/>
+                <input type="submit" name="reindexnow" value="start reindex job now" class="btn btn-primary"/>
+                ::<input type="submit" name="stopreindex" value="stop reindexing" class="btn btn-primary"/>
                 #(/reindexjobrunning)# 
                 <p class="info">#[infomessage]#</p>                            
             </fieldset>

source/net/yacy/http/servlets/YaCyProxyServlet.java

@@ -133,10 +133,11 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
             final HashMap<String, Object> prop = new HashMap<String, Object>();
             prop.put(HeaderFramework.CONNECTION_PROP_HTTP_VER, HeaderFramework.HTTP_VERSION_1_1);
             prop.put(HeaderFramework.CONNECTION_PROP_HOST, hostwithport);
-            prop.put(HeaderFramework.CONNECTION_PROP_PATH, proxyurl.getFile().replaceAll(" ", "%20"));
+            prop.put(HeaderFramework.CONNECTION_PROP_PATH, proxyurl.getPath().replaceAll(" ", "%20"));
             prop.put(HeaderFramework.CONNECTION_PROP_CLIENTIP, Domains.LOCALHOST);
 
             yacyRequestHeader.put(HeaderFramework.HOST, hostwithport );
+            yacyRequestHeader.put(HeaderFramework.CONNECTION_PROP_PATH, proxyurl.getPath());
 
             final ByteArrayOutputStream tmpproxyout = new ByteArrayOutputStream();
             HTTPDProxyHandler.doGet(prop, yacyRequestHeader, tmpproxyout, ClientIdentification.yacyProxyAgent);