Upgrade jquery from 1.10.2 to 1.12.2 (#3571)

--------- Co-authored-by: chundonglinlin <[email protected]>
ossrs · Jun 29, 2023 · 30c2f50 · 30c2f50
1 parent cb44e81
commit 30c2f50
Show file tree

Hide file tree

Showing 32 changed files with 29 additions and 81 deletions.
diff --git a/trunk/3rdparty/CherryPy-3.2.4.zip b/trunk/3rdparty/CherryPy-3.2.4.zip
diff --git a/trunk/3rdparty/README.md b/trunk/3rdparty/README.md
@@ -24,10 +24,6 @@ openssl-OpenSSL_1_0_2u.tar.gz
 * SRTP depends on openssl 1.0.*, so we use both ssl versions.
 * https://ossrs.net/lts/zh-cn/license#openssl
 
-CherryPy-3.2.4.zip
-* sample api server for srs.
-* https://pypi.python.org/pypi/CherryPy/3.2.4
-
 libsrtp-2.3.0.tar.gz
 * For WebRTC, SRTP to encrypt and decrypt RTP.
 * https://github.com/cisco/libsrtp/releases/tag/v2.3.0

diff --git a/trunk/3rdparty/bootstrap.2.3.2.zip b/trunk/3rdparty/bootstrap.2.3.2.zip
diff --git a/trunk/3rdparty/jquery-1.10.2.zip b/trunk/3rdparty/jquery-1.10.2.zip
diff --git a/trunk/3rdparty/signaling/www/demos/js/jquery-1.10.2.min.js b/trunk/3rdparty/signaling/www/demos/js/jquery-1.10.2.min.js
diff --git a/trunk/3rdparty/signaling/www/demos/js/jquery-1.10.2.min.map b/trunk/3rdparty/signaling/www/demos/js/jquery-1.10.2.min.map
diff --git a/trunk/3rdparty/signaling/www/demos/js/jquery-1.12.2.min.js b/trunk/3rdparty/signaling/www/demos/js/jquery-1.12.2.min.js
diff --git a/trunk/3rdparty/signaling/www/demos/js/jquery-1.12.2.min.map b/trunk/3rdparty/signaling/www/demos/js/jquery-1.12.2.min.map
diff --git a/trunk/3rdparty/signaling/www/demos/one2one.html b/trunk/3rdparty/signaling/www/demos/one2one.html
@@ -9,7 +9,7 @@
         }
     </style>
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
     <script type="text/javascript" src="js/srs.sdk.js"></script>
     <script type="text/javascript" src="js/srs.sig.js"></script>

diff --git a/trunk/3rdparty/signaling/www/demos/room.html b/trunk/3rdparty/signaling/www/demos/room.html
@@ -9,7 +9,7 @@
         }
     </style>
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
     <script type="text/javascript" src="js/srs.sdk.js"></script>
     <script type="text/javascript" src="js/srs.sig.js"></script>

diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
@@ -353,41 +353,6 @@ if [[ ! -f $SRS_WORKDIR/conf/server.key || ! -f $SRS_WORKDIR/conf/server.crt ]];
     echo "Generate test-only self-sign certificate files"
 fi
 
-#####################################################################################
-# cherrypy for http hooks callback, CherryPy-3.2.4
-#####################################################################################
-# TODO: FIXME: Replace by Go.
-if [[ $SRS_CHERRYPY == YES ]]; then
-    # Detect python or python2
-    python --version >/dev/null 2>&1 && SYS_PYTHON=python;
-    python2 --version >/dev/null 2>&1 && SYS_PYTHON=python2;
-    # Install cherrypy for api server.
-    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/CherryPy-3.2.4/setup.py ]]; then
-        echo "CherryPy-3.2.4 is ok.";
-    else
-        echo "Installing CherryPy-3.2.4";
-        (
-            rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS}/${SRS_PLATFORM} &&
-            unzip -q ../../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 &&
-            $SYS_PYTHON setup.py install --user --prefix=''
-        )
-    fi
-    # check status
-    ret=$?; if [[ $ret -ne 0 ]]; then echo "build CherryPy-3.2.4 failed, ret=$ret"; exit $ret; fi
-    if [ ! -f ${SRS_OBJS}/${SRS_PLATFORM}/CherryPy-3.2.4/setup.py ]; then echo "build CherryPy-3.2.4 failed."; exit -1; fi
-
-    echo "Link players to cherrypy static-dir"
-    rm -rf research/api-server/static-dir/players &&
-    ln -sf $SRS_WORKDIR/research/players research/api-server/static-dir/players &&
-    rm -rf research/api-server/static-dir/live &&
-    mkdir -p $SRS_WORKDIR/${SRS_OBJS}/nginx/html/live &&
-    ln -sf $SRS_WORKDIR/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live &&
-    rm -rf research/api-server/static-dir/forward &&
-    mkdir -p $SRS_WORKDIR/${SRS_OBJS}/nginx/html/forward &&
-    ln -sf $SRS_WORKDIR/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward
-    ret=$?; if [[ $ret -ne 0 ]]; then echo "Warning: Ignore error to link players to cherrypy static-dir."; fi
-fi
-
 #####################################################################################
 # openssl, for rtmp complex handshake and HLS encryption.
 #####################################################################################

diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
@@ -28,7 +28,6 @@ SRS_HTTP_API=YES
 SRS_HTTP_CORE=YES
 SRS_HLS=YES
 SRS_DVR=YES
-SRS_CHERRYPY=NO
 # 
 ################################################################
 # FFmpeg stub is the stub code in SRS for ingester or encoder.
@@ -234,7 +233,6 @@ Experts:
 
 Deprecated:
   --hds=on|off              Whether build the hds streaming, mux RTMP to F4M/F4V files. Default: $(value2switch $SRS_HDS)
-  --cherrypy=on|off         Whether install CherryPy for demo api-server. Default: $(value2switch $SRS_CHERRYPY)
   --osx                     Enable build for OSX/Darwin AppleOS. Deprecated for automatically detecting the OS.
   --x86-64                  Enable build for __x86_64 systems. Deprecated for automatically detecting the OS.
   --x86-x64                 Enable build for __x86_64 systems. Deprecated for automatically detecting the OS.
@@ -338,7 +336,6 @@ function parse_user_option() {
         --with-utest)                   SRS_UTEST=YES               ;;
         --without-utest)                SRS_UTEST=NO                ;;
         --utest)                        SRS_UTEST=$(switch2value $value) ;;
-        --cherrypy)                     SRS_CHERRYPY=$(switch2value $value) ;;
         --gcov)                         SRS_GCOV=$(switch2value $value) ;;
         --apm)                          SRS_APM=$(switch2value $value) ;;
 
@@ -626,7 +623,6 @@ function regenerate_options() {
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --stream-converter=$(value2switch $SRS_STREAM_CASTER)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-api=$(value2switch $SRS_HTTP_API)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --utest=$(value2switch $SRS_UTEST)"
-    SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cherrypy=$(value2switch $SRS_CHERRYPY)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srt=$(value2switch $SRS_SRT)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --rtc=$(value2switch $SRS_RTC)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --h265=$(value2switch $SRS_H265)"

diff --git a/trunk/configure b/trunk/configure
@@ -832,13 +832,6 @@ fi
 #####################################################################################
 # next step
 #####################################################################################
-if [[ $SRS_CHERRYPY == YES ]]; then
-  echo ""
-  echo "You can run 3rdparty applications:"
-  if [[ $SRS_HTTP_CALLBACK == YES ]]; then
-      echo -e "\" python ./research/api-server/server.py 8085  \" to start the api-server"
-  fi
-fi
 echo ""
 echo "You can build SRS:"
 echo "\" make \" to build the SRS server"

diff --git a/trunk/research/players/api-server_index.html b/trunk/research/players/api-server_index.html
@@ -3,7 +3,7 @@
 <head>
     <title>SRS</title>   
     <meta charset="utf-8">
-    <script type="text/javascript" src="players/js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="players/js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="players/js/srs.page.js"></script>
     <script type="text/javascript" src="players/js/srs.utility.js"></script>
     <script type="text/javascript" src="players/js/winlin.utility.js"></script>

diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
@@ -9,7 +9,7 @@
             padding-top: 30px;
         }
     </style>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.page.js"></script>

diff --git a/trunk/research/players/js/jquery-1.10.2.min.js b/trunk/research/players/js/jquery-1.10.2.min.js
diff --git a/trunk/research/players/js/jquery-1.10.2.min.map b/trunk/research/players/js/jquery-1.10.2.min.map
diff --git a/trunk/research/players/js/jquery-1.12.2.min.js b/trunk/research/players/js/jquery-1.12.2.min.js
diff --git a/trunk/research/players/js/jquery-1.12.2.min.map b/trunk/research/players/js/jquery-1.12.2.min.map
diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html
@@ -9,7 +9,7 @@
         }
     </style>
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
     <script type="text/javascript" src="js/srs.sdk.js"></script>
     <script type="text/javascript" src="js/winlin.utility.js"></script>

diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html
@@ -9,7 +9,7 @@
         }
     </style>
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
     <script type="text/javascript" src="js/srs.sdk.js"></script>
     <script type="text/javascript" src="js/winlin.utility.js"></script>

diff --git a/trunk/research/players/srs-http-server_index.html b/trunk/research/players/srs-http-server_index.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 </body>
-<script type="text/javascript" src="players/js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="players/js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="players/js/srs.page.js"></script>
 <script type="text/javascript" src="players/js/srs.utility.js"></script>
 <script type="text/javascript" src="players/js/winlin.utility.js"></script>

diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html
@@ -94,7 +94,7 @@ <h3>SRS Bandwidth Check</h3>
     </div>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 <script type="text/javascript" src="js/swfobject.js"></script>
 <script type="text/javascript" src="js/srs.page.js"></script>

diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
@@ -50,7 +50,7 @@
     </footer>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 </html>
 
diff --git a/trunk/research/players/srs_gb28181.html b/trunk/research/players/srs_gb28181.html
@@ -233,7 +233,7 @@ <h3>创建通道</h3>
     </footer>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 <script type="text/javascript" src="js/json2.js"></script>
 <script type="text/javascript" src="js/srs.page.js"></script>

diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
@@ -100,7 +100,7 @@
     </footer>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 <script type="text/javascript" src="js/mpegts-1.7.3.min.js"></script>
 <script type="text/javascript" src="js/hls-0.14.17.min.js"></script>

diff --git a/trunk/research/players/srs_player_deprecated.html b/trunk/research/players/srs_player_deprecated.html
@@ -284,7 +284,7 @@ <h3><a href="https://github.com/ossrs/srs">SrsPlayer</a></h3>
     </footer>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 <script type="text/javascript" src="js/swfobject.js"></script>
 <script type="text/javascript" src="js/json2.js"></script>

diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
@@ -45,7 +45,7 @@
     </footer>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 <script type="text/javascript">
     $(function(){

diff --git a/trunk/research/players/srs_publisher_flash.html b/trunk/research/players/srs_publisher_flash.html
@@ -251,7 +251,7 @@ <h3>音频编码</h3>
     </footer>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 <script type="text/javascript" src="js/swfobject.js"></script>
 <script type="text/javascript" src="js/json2.js"></script>

diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html
@@ -41,7 +41,7 @@
     </footer>
 </div>
 </body>
-<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
 <script type="text/javascript" src="js/bootstrap.min.js"></script>
 <script type="text/javascript" src="js/swfobject.js"></script>
 <script type="text/javascript" src="js/srs.page.js"></script>

diff --git a/trunk/research/players/whep.html b/trunk/research/players/whep.html
@@ -9,7 +9,7 @@
         }
     </style>
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
     <script type="text/javascript" src="js/srs.sdk.js"></script>
     <script type="text/javascript" src="js/winlin.utility.js"></script>

diff --git a/trunk/research/players/whip.html b/trunk/research/players/whip.html
@@ -9,7 +9,7 @@
         }
     </style>
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
-    <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.12.2.min.js"></script>
     <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script>
     <script type="text/javascript" src="js/srs.sdk.js"></script>
     <script type="text/javascript" src="js/winlin.utility.js"></script>