Hi Roberto, I tried using both -p1 and -p0, neither of which seemed to work. Could you possibly commit this fix to an unstable branch in SVN instead?
[email protected] [~] > ls -lah | grep uwsgi-0.9.6 drwxr-x--- 10 501 staff 4.0K Nov 3 23:01 uwsgi-0.9.6.5 -rw-r--r-- 1 root root 149K Sep 29 07:25 uwsgi-0.9.6.5.tar.gz drwxr-x--- 10 root root 4.0K Feb 2 22:46 uwsgi-0.9.6.7 -rw-r--r-- 1 root root 154K Jan 30 06:01 uwsgi-0.9.6.7.tar.gz drwxr-x--- 10 foxx foxx 4.0K Jan 30 05:57 uwsgi-0.9.6.8 [email protected] [~] > patch -p1 < uwsgi_0967_0968.patch can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r -u uwsgi-0.9.6.7/ChangeLog uwsgi-0.9.6.8/ChangeLog |--- uwsgi-0.9.6.7/ChangeLog 2011-01-30 06:57:27.000000000 +0100 |+++ uwsgi-0.9.6.8/ChangeLog 2011-01-31 21:31:28.302483000 +0100 -------------------------- File to patch: [email protected] [~/uwsgi-0.9.6.8] > patch -p1 < ../uwsgi_0967_0968.patch patching file ChangeLog patching file setup.py patching file uwsgi.c Hunk #1 FAILED at 160. Hunk #2 FAILED at 909. Hunk #3 FAILED at 1835. 3 out of 4 hunks FAILED -- saving rejects to file uwsgi.c.rej patching file uwsgi.h Hunk #1 FAILED at 2. Hunk #2 FAILED at 482. 2 out of 2 hunks FAILED -- saving rejects to file uwsgi.h.rej [email protected] [~/uwsgi-0.9.6.7] > patch -p1 < ../uwsgi_0967_0968.patch patching file ChangeLog patching file setup.py patching file uwsgi.c Hunk #1 FAILED at 160. Hunk #2 FAILED at 909. Hunk #3 FAILED at 1835. 3 out of 4 hunks FAILED -- saving rejects to file uwsgi.c.rej patching file uwsgi.h Hunk #1 FAILED at 2. Hunk #2 FAILED at 482. 2 out of 2 hunks FAILED -- saving rejects to file uwsgi.h.rej [email protected] [~/uwsgi-0.9.6.7] > patch -p1 < ../uwsgi_0967_0968.patch patching file ChangeLog Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file ChangeLog.rej patching file setup.py Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file setup.py.rej patching file uwsgi.c Hunk #1 FAILED at 160. Hunk #2 FAILED at 909. Hunk #3 FAILED at 1835. Hunk #4 FAILED at 3713. 4 out of 4 hunks FAILED -- saving rejects to file uwsgi.c.rej patching file uwsgi.h Hunk #1 FAILED at 2. Hunk #2 FAILED at 482. 2 out of 2 hunks FAILED -- saving rejects to file uwsgi.h.rej On Mon, Jan 31, 2011 at 8:35 PM, Roberto De Ioris <[email protected]> wrote: > > Hey, > > > > I've been using uWSGI 0.9.5.4 with the following configuration for > several > > months: > > > > However, upon upgrading to uwsgi-0.9.6.7, we experienced the following > > error: > > malloc(): Cannot allocate memory [uwsgi.c line 915] > > > > After testing each command line option we had, it was pin pointed to the > > --limit-as option: > > > > With --limit-as: > > *** Starting uWSGI 0.9.6.7 (64bit) on [Mon Jan 31 19:55:33 2011] *** > > compiled with version: 4.3.2 > > Python version: 2.7 Stackless 3.1b3 060516 (release27-maint, Aug 29 2010, > > 15:44:48) [GCC 4.3.2] > > limiting address space of processes... > > your process address space limit is 268435456 bytes (256 MB) > > your memory page size is 4096 bytes > > *** WARNING: you have enabled harakiri without post buffering. Slow > > upload > > could be rejected on post-unbuffered webservers *** > > malloc(): Cannot allocate memory [uwsgi.c line 915] > > > > Without --limit-as: > > *** Starting uWSGI 0.9.6.7 (64bit) on [Mon Jan 31 19:55:12 2011] *** > > compiled with version: 4.3.2 > > Python version: 2.7 Stackless 3.1b3 060516 (release27-maint, Aug 29 2010, > > 15:44:48) [GCC 4.3.2] > > *** WARNING: you are running uWSGI without its master process manager > *** > > your memory page size is 4096 bytes > > *** WARNING: you have enabled harakiri without post buffering. Slow > > upload > > could be rejected on post-unbuffered webservers *** > > allocated 640 bytes (0 KB) for 1 request's buffer. > > binding on UNIX socket: /******/uwsgi.sock > > your server socket listen backlog is limited to 100 connections > > initializing hooks...done. > > interpreter for app 0 initialized. > > application 0 (/) ready > > setting default application to 0 > > *** uWSGI is running in multiple interpreter mode *** > > spawned uWSGI worker 1 (and the only) (pid: 7835) > > _______________________________________________ > > uWSGI mailing list > > [email protected] > > http://lists.unbit.it/cgi-bin/mailman/listinfo/uwsgi > > > > Try attached patch > > -- > Roberto De Ioris > http://unbit.it > _______________________________________________ > uWSGI mailing list > [email protected] > http://lists.unbit.it/cgi-bin/mailman/listinfo/uwsgi > >
_______________________________________________ uWSGI mailing list [email protected] http://lists.unbit.it/cgi-bin/mailman/listinfo/uwsgi
