Mercurial > hgrepos > FreeBSD > ports > www > uwsginl
changeset 144:80fc69a2ce1f
Copy regenerated patches from uwsginl to files/extra
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Sun, 25 Sep 2022 19:08:34 +0200 |
| parents | 8bb446cd21c1 |
| children | 527a4ea8ee93 |
| files | uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__setup.py |
| diffstat | 2 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Sun Sep 25 19:03:57 2022 +0200 +++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Sun Sep 25 19:08:34 2022 +0200 @@ -1,5 +1,5 @@ ---- plugins/pypy/pypy_plugin.c.orig 2020-07-09 07:54:09.000000000 +0200 -+++ plugins/pypy/pypy_plugin.c 2020-08-05 09:21:06.250984000 +0200 +--- plugins/pypy/pypy_plugin.c.orig 2022-09-21 14:46:45 UTC ++++ plugins/pypy/pypy_plugin.c @@ -42,9 +42,10 @@ void (*uwsgi_pypy_hook_paste_loader)(char *); void (*uwsgi_pypy_hook_pythonpath)(char *); void (*uwsgi_pypy_hook_request)(void *, int);
--- a/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__setup.py Sun Sep 25 19:03:57 2022 +0200 +++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__setup.py Sun Sep 25 19:08:34 2022 +0200 @@ -1,6 +1,6 @@ ---- plugins/pypy/pypy_setup.py.orig 2020-07-09 07:54:09.000000000 +0200 -+++ plugins/pypy/pypy_setup.py 2020-08-05 02:24:53.865927000 +0200 -@@ -31,8 +31,15 @@ +--- plugins/pypy/pypy_setup.py.orig 2022-09-21 14:46:45 UTC ++++ plugins/pypy/pypy_setup.py +@@ -31,8 +31,15 @@ extern void (*uwsgi_pypy_hook_paste_loader)(char *); extern void (*uwsgi_pypy_hook_pythonpath)(char *); extern void (*uwsgi_pypy_hook_request)(struct wsgi_request *); extern void (*uwsgi_pypy_post_fork_hook)(void); @@ -16,7 +16,7 @@ # here we load CFLAGS and uwsgi.h from the binary defines0 = ''' char *uwsgi_get_cflags(); -@@ -46,7 +53,7 @@ +@@ -46,7 +53,7 @@ lib0 = ffi.verify(defines0) # basically it build a list of #define from binary CFLAGS uwsgi_cdef = [] uwsgi_defines = [] @@ -25,7 +25,7 @@ for cflag in uwsgi_cflags: if cflag.startswith('-D'): line = cflag[2:] -@@ -57,8 +64,14 @@ +@@ -57,8 +64,14 @@ for cflag in uwsgi_cflags: else: uwsgi_cdef.append('#define %s ...' % line) uwsgi_defines.append('#define %s 1' % line) @@ -41,7 +41,7 @@ # uwsgi definitions cdefines = ''' %s -@@ -110,6 +123,8 @@ +@@ -110,6 +123,8 @@ struct uwsgi_worker { uint64_t running_time; uint64_t avg_response_time; uint64_t tx; @@ -50,7 +50,7 @@ ...; }; -@@ -164,11 +179,14 @@ +@@ -164,11 +179,14 @@ struct uwsgi_server { struct wsgi_request *wsgi_req; struct uwsgi_plugin *p[]; @@ -66,7 +66,7 @@ const char *uwsgi_pypy_version; -@@ -269,7 +287,7 @@ +@@ -269,7 +287,7 @@ const char *uwsgi_pypy_version = UWSGI_VERSION; %s extern struct uwsgi_server uwsgi; @@ -75,7 +75,7 @@ %s ''' % ('\n'.join(uwsgi_defines), uwsgi_dot_h, hooks) -@@ -286,7 +304,7 @@ +@@ -286,7 +304,7 @@ wsgi_application = None # fix argv if needed if len(sys.argv) == 0: @@ -84,7 +84,7 @@ @ffi.callback("void(char *)") -@@ -305,7 +323,7 @@ +@@ -305,7 +323,7 @@ def uwsgi_pypy_loader(module): load a wsgi module """ global wsgi_application @@ -93,7 +93,7 @@ c = 'application' if ':' in m: m, c = m.split(':') -@@ -322,7 +340,7 @@ +@@ -322,7 +340,7 @@ def uwsgi_pypy_file_loader(filename): load a mod_wsgi compliant .wsgi file """ global wsgi_application @@ -102,7 +102,7 @@ c = 'application' mod = imp.load_source('uwsgi_file_wsgi', w) wsgi_application = getattr(mod, c) -@@ -334,7 +352,7 @@ +@@ -334,7 +352,7 @@ def uwsgi_pypy_paste_loader(config): load a .ini paste app """ global wsgi_application @@ -111,7 +111,7 @@ if c.startswith('config:'): c = c[7:] if c[0] != '/': -@@ -358,12 +376,47 @@ +@@ -358,12 +376,47 @@ def uwsgi_pypy_post_fork_hook(): uwsgi.post_fork_hook() @@ -160,7 +160,7 @@ sys.path.append(path) print("added %s to pythonpath" % path) -@@ -470,15 +523,17 @@ +@@ -470,15 +523,17 @@ def uwsgi_pypy_wsgi_handler(wsgi_req): def start_response(status, headers, exc_info=None): if exc_info: traceback.print_exception(*exc_info) @@ -179,7 +179,7 @@ environ['wsgi.version'] = (1, 0) scheme = 'http' -@@ -523,6 +578,7 @@ +@@ -523,6 +578,7 @@ lib.uwsgi_pypy_hook_paste_loader = uwsgi_pypy_paste_lo lib.uwsgi_pypy_hook_pythonpath = uwsgi_pypy_pythonpath lib.uwsgi_pypy_hook_request = uwsgi_pypy_wsgi_handler lib.uwsgi_pypy_post_fork_hook = uwsgi_pypy_post_fork_hook @@ -187,7 +187,7 @@ """ Here we define the "uwsgi" virtual module -@@ -537,7 +593,7 @@ +@@ -537,7 +593,7 @@ uwsgi.hostname = ffi.string(lib.uwsgi.hostname) def uwsgi_pypy_uwsgi_register_signal(signum, kind, handler): cb = ffi.callback('void(int)', handler) uwsgi_gc.append(cb) @@ -196,7 +196,7 @@ raise Exception("unable to register signal %d" % signum) uwsgi.register_signal = uwsgi_pypy_uwsgi_register_signal -@@ -562,7 +618,7 @@ +@@ -562,7 +618,7 @@ def uwsgi_pypy_uwsgi_register_rpc(name, func, argc=0): rpc_func = uwsgi_pypy_RPC(func) cb = ffi.callback("int(int, char*[], int[], char**)", rpc_func) uwsgi_gc.append(cb) @@ -205,7 +205,7 @@ raise Exception("unable to register rpc func %s" % name) uwsgi.register_rpc = uwsgi_pypy_uwsgi_register_rpc -@@ -598,8 +654,8 @@ +@@ -598,8 +654,8 @@ uwsgi.rpc = uwsgi_pypy_rpc def uwsgi_pypy_call(func, *args): node = None
