Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DEF5F96C0 for ; Fri, 16 Dec 2011 13:45:05 +0000 (UTC) Received: (qmail 82392 invoked by uid 500); 16 Dec 2011 13:45:05 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 82375 invoked by uid 500); 16 Dec 2011 13:45:05 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 82368 invoked by uid 99); 16 Dec 2011 13:45:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 13:45:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2011 13:45:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 125122388AA9 for ; Fri, 16 Dec 2011 13:44:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1215129 - /deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb Date: Fri, 16 Dec 2011 13:44:42 -0000 To: commits@deltacloud.apache.org From: mfojtik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111216134442.125122388AA9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mfojtik Date: Fri Dec 16 13:44:41 2011 New Revision: 1215129 URL: http://svn.apache.org/viewvc?rev=1215129&view=rev Log: Core: Added fix for wrong handling of REQUEST_PATH in platforms like Passenger Modified: deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb Modified: deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb?rev=1215129&r1=1215128&r2=1215129&view=diff ============================================================================== --- deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb (original) +++ deltacloud/trunk/server/lib/sinatra/rack_matrix_params.rb Fri Dec 16 13:44:41 2011 @@ -79,8 +79,12 @@ module Rack env['REQUEST_URI'] = env['REQUEST_PATH'] env['REQUEST_PATH'] = env['PATH_INFO'] end - env['REQUEST_PATH'] = env['REQUEST_PATH'].gsub(/;([^\/]*)/, '').gsub(/\?(.*)$/, '') - env['PATH_INFO'] = env['REQUEST_PATH'] + + # This is needed for OpenShift deployment / Passenger + if env['REQUEST_PATH'] + env['REQUEST_PATH'] = env['REQUEST_PATH'].gsub(/;([^\/]*)/, '').gsub(/\?(.*)$/, '') + env['PATH_INFO'] = env['REQUEST_PATH'] + end # (2) Append the matrix params to the 'normal' request params # FIXME: Make this work for multipart/form-data