← Back to branch summary

~rdoering/ubuntu/intrepid/erlang/fix-535090

« back to all changes in this revision

Viewing changes to lib/inets/src/http_server/httpd.erl

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-01 16:57:10 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070501165710-2sapk0hp2gf3o0ip
Tags: 1:11.b.4-2ubuntu1
* Merge with Debian Unstable. Remaining changes:
  - Add -fno-stack-protector to fix broken crypto_drv.
* DebianMaintainerField update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/inets/src/http_server/httpd.erl
502
502
 
503
503
read_mfile(eof, _Fd, SoFar) ->
504
504
    {ok,lists:reverse(SoFar)};
505
 
read_mfile({error,Reason} ,_Fd, _SoFar) ->
506
 
    {error,Reason};
507
505
read_mfile([$# | _Comment], Fd, SoFar) ->
508
506
    read_mfile(read_line(Fd), Fd, SoFar);
509
507
read_mfile([], Fd, SoFar) ->