Browse Source

[fix] socketio 2.0 (#3257)

version-14
Rushabh Mehta 8 years ago
committed by Nabin Hait
parent
commit
a9ec46545b
2 changed files with 5 additions and 7000 deletions
  1. +2
    -7000
      frappe/public/js/lib/socket.io.min.js
  2. +3
    -0
      frappe/utils/data.py

+ 2
- 7000
frappe/public/js/lib/socket.io.min.js
File diff suppressed because it is too large
View File


+ 3
- 0
frappe/utils/data.py View File

@@ -613,6 +613,9 @@ def get_url(uri=None, full_address=False):
if not uri and full_address:
uri = frappe.get_request_header("REQUEST_URI", "")

if frappe.conf.http_port:
host_name = host_name + ':' + str(frappe.conf.http_port)

url = urllib.basejoin(host_name, uri) if uri else host_name

return url


Loading…
Cancel
Save