diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2015-04-15 06:31:59 +0000 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2015-04-15 09:54:30 +0200 |
| commit | e251e99d0dae14ab91e47c6c2d6cd66d8844bd5c (patch) | |
| tree | 34f0c92780bb0304a8d07d59443d67cd7208f51d /jack/etc | |
| parent | f342be3b4ec947bf5f0fba4a26506dd3f54a8812 (diff) | |
| download | toolchain_jack-e251e99d0dae14ab91e47c6c2d6cd66d8844bd5c.tar.gz toolchain_jack-e251e99d0dae14ab91e47c6c2d6cd66d8844bd5c.tar.bz2 toolchain_jack-e251e99d0dae14ab91e47c6c2d6cd66d8844bd5c.zip | |
Revert "Introduce protocol number and jack version in Jack server"
This reverts commit baff988ebb836d4d2facc4091924d10e744863d2.
Change-Id: I2c8f35f60496bf647f931270fe617d9ee4c803ff
Diffstat (limited to 'jack/etc')
| -rwxr-xr-x | jack/etc/jack | 11 | ||||
| -rwxr-xr-x | jack/etc/jack-admin | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/jack/etc/jack b/jack/etc/jack index 92eda239..bfe20fb0 100755 --- a/jack/etc/jack +++ b/jack/etc/jack @@ -14,11 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# v 1.1-a11 (2-12) +# v 1.1-a11 # -NEEDED_VERSION=2-12 -PROTOCOLE_VERSION=1 - set -o nounset umask 077 @@ -126,7 +123,7 @@ DELAY_CONNECT=3 # Launch compilation DATE_CONNECT=$(date +%s) while true; do - HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} --connect-timeout 5 --no-proxy 127.0.0.1:$SERVER_PORT_SERVICE http://127.0.0.1:$SERVER_PORT_SERVICE/jack/$PROTOCOLE_VERSION/$NEEDED_VERSION <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI") + HTTP_CODE=$(curl --fail --silent --data @- --output "$JACK_EXIT" --write-out %{http_code} --connect-timeout 5 --no-proxy 127.0.0.1:$SERVER_PORT_SERVICE http://127.0.0.1:$SERVER_PORT_SERVICE/jack <<< "+ $JACK_OUT $JACK_ERR $JACK_CLI") CURL_CODE=$? JACK_CODE=$(cat "$JACK_EXIT") if [ $CURL_CODE -eq 0 ]; then @@ -160,10 +157,6 @@ while true; do # 400: Bad request echo "Bad request, see server log ($SERVER_LOG)" >&2 abort - elif [ $HTTP_CODE -eq 501 ]; then - # 501: Not implemented - echo "Jack version not available, try to shutdown server (jack-admin stop-server)" >&2 - abort else # Other echo "Internal unknown error ($HTTP_CODE), try other ports in ~/.jack, or see server log ($SERVER_LOG)" >&2 diff --git a/jack/etc/jack-admin b/jack/etc/jack-admin index 0d4546a6..c3a00071 100755 --- a/jack/etc/jack-admin +++ b/jack/etc/jack-admin @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# v 1.1-a11 (2-12) +# v 1.1-a11 # set -o nounset umask 077 |