| Author |
Message |
|
| Guest |
 Posted: Sat Sep 22, 2007 10:38 am |
 |
|
|
Guest
|
I propose the following patch to 1.72
--- yaws_server.erl~ 2007-09-11 04:37:04.000000000 -0400
+++ yaws_server.erl 2007-09-22 06:33:34.000000000 -0400
@@ -2453,6 +2453,8 @@
%% SC = get(sc),
%% ssi(File, Delimiter, Bindings, Dir, SC#sconf.docroot, SC ).
+ssi(File, Delimiter, Bindings) ->
+ ssi(File, Delimiter, Bindings, get(yaws_ut), get(yaws_arg), get
(sc)).
ssi(File, Delimiter, Bindings, UT, ARG) ->
ssi(File, Delimiter, Bindings, UT, ARG, get(sc)).
--- yaws_api.erl~ 2007-05-24 15:15:14.000000000 -0400
+++ yaws_api.erl 2007-09-22 06:34:42.000000000 -0400
@@ -1175,10 +1175,7 @@
ehtml_expand(Bin) when binary(Bin) -> Bin; % yaws_api:htmlize(Bin);
ehtml_expand({ssi,File, Del, Bs}) ->
- UT = get(yaws_ut),
- ARG = get(yaws_arg),
-
- case yaws_server:ssi(File, Del, Bs, UT, ARG) of
+ case yaws_server:ssi(File, Del, Bs) of
{error, Rsn} ->
io_lib:format("ERROR: ~p~n",[Rsn]);
X ->
@@ -1314,10 +1311,7 @@
ehtml_expander_done(yaws_api:htmlize(Bin), Before, After);
ehtml_expander({ssi,File, Del, Bs}, Before, After) ->
- UT = get(yaws_ut),
- ARG = get(yaws_arg),
-
- Str = case yaws_server:ssi(File, Del, Bs, UT, ARG) of
+ Str = case yaws_server:ssi(File, Del, Bs) of
{error, Rsn} ->
io_lib:format("ERROR: ~p~n",[Rsn]);
X ->
Richard Bucker
richard@bucker.net
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Erlyaws-list mailing list
Erlyaws-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/erlyaws-list
Post recived from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Sun Sep 23, 2007 9:03 pm |
|
|
|
Guest
|
Richard wrote:
> I propose the following patch to 1.72
>
Patch applied, although it wasn't applicable by the patch program.
I emphasize to the list again:
From
# man patch
....
NOTES FOR PATCH SENDERS
There are several things you should bear in mind if you are going to be
sending out patches.
Create your patch systematically. A good method is the command
diff -Naur old new where old and new identify the old and new directo-
ries. The names old and new should not contain any slashes. The diff
command's headers should have dates and times in Universal Time using
traditional Unix format, so that patch recipients can use the -Z or
--set-utc option. Here is an example command, using Bourne shell syn-
tax:
LC_ALL=C TZ=UTC0 diff -Naur gcc-2.7 gcc-2.8
Tell your recipients how to apply the patch by telling them which
directory to cd to, and which patch options to use. The option string
-Np1 is recommended. Test your procedure by pretending to be a recipi-
ent and applying your patch to a copy of the original files.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Erlyaws-list mailing list
Erlyaws-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/erlyaws-list
Post recived from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Sun Sep 23, 2007 10:04 pm |
|
|
|
Guest
|
I'm sorry, this was my first patch. I used the '-Naur' params but not
the others. I might suggest some sort of 'best practice' on the yaws
home-page.
PS: is there a CVS or SVN server? (I like GIT because it has push/
pill/patch via email built-in)
On Sep 23, 2007, at 5:03 PM, Claes Wikstrom wrote:
Richard wrote:
> I propose the following patch to 1.72
Patch applied, although it wasn't applicable by the patch program.
I emphasize to the list again:
From
# man patch
....
NOTES FOR PATCH SENDERS
There are several things you should bear in mind if you are
going to be
sending out patches.
Create your patch systematically. A good method is
the command
diff -Naur old new where old and new identify the old and
new directo-
ries. The names old and new should not contain any
slashes. The diff
command's headers should have dates and times in Universal
Time using
traditional Unix format, so that patch recipients can use
the -Z or
--set-utc option. Here is an example command, using Bourne
shell syn-
tax:
LC_ALL=C TZ=UTC0 diff -Naur gcc-2.7 gcc-2.8
Tell your recipients how to apply the patch by telling
them which
directory to cd to, and which patch options to use. The
option string
-Np1 is recommended. Test your procedure by pretending to be
a recipi-
ent and applying your patch to a copy of the original files.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Erlyaws-list mailing list
Erlyaws-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/erlyaws-list
Post recived from mailinglist |
|
|
| Back to top |
|
| tobbe |
| Posted: Mon Sep 24, 2007 9:11 pm |
|
|
|
User
Joined: 19 Jan 2005
Posts: 274
Location: Stockholm, Sweden
|
Richard wrote:
> I'm sorry, this was my first patch. I used the '-Naur' params but not
> the others. I might suggest some sort of 'best practice' on the yaws
> home-page.
>
> PS: is there a CVS or SVN server? (I like GIT because it has push/
> pill/patch via email built-in)
There is an unofficial git-repos that tracks the official Sourceforge
svn repos:
http://www.tornkvist.org/gitweb?p=yaws.git;a=summary
It is updated once a day.
It should be possible to checkout the repos as:
git clone git://www.tornkvist.org/yaws
Cheers, Tobbe
>
>
>
>
> On Sep 23, 2007, at 5:03 PM, Claes Wikstrom wrote:
>
> Richard wrote:
>> I propose the following patch to 1.72
>
> Patch applied, although it wasn't applicable by the patch program.
>
> I emphasize to the list again:
>
> From
>
> # man patch
> ....
>
> NOTES FOR PATCH SENDERS
> There are several things you should bear in mind if you are
> going to be
> sending out patches.
>
> Create your patch systematically. A good method is
> the command
> diff -Naur old new where old and new identify the old and
> new directo-
> ries. The names old and new should not contain any
> slashes. The diff
> command's headers should have dates and times in Universal
> Time using
> traditional Unix format, so that patch recipients can use
> the -Z or
> --set-utc option. Here is an example command, using Bourne
> shell syn-
> tax:
>
> LC_ALL=C TZ=UTC0 diff -Naur gcc-2.7 gcc-2.8
>
> Tell your recipients how to apply the patch by telling
> them which
> directory to cd to, and which patch options to use. The
> option string
> -Np1 is recommended. Test your procedure by pretending to be
> a recipi-
> ent and applying your patch to a copy of the original files.
>
>
>
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Microsoft
> Defy all challenges. Microsoft(R) Visual Studio 2005.
> http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Erlyaws-list mailing list
Erlyaws-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/erlyaws-list
Post recived from mailinglist |
|
|
| Back to top |
   
|
|
|
All times are GMT
|
|
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You can attach files in this forum
You can download files in this forum
|
|
|
Digg It
Del.icio.us
Reddit
Facebook
Stumble Upon
Technorati
