← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/writeframeserver.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-04-28 12:11:12 UTC
  • mto: (14.1.6 experimental) (1.5.1)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20120428121112-2zi0vp8b6vejda8i
Tags: upstream-2.63
Import upstream version 2.63

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/writeframeserver.c
206
206
 
207
207
        *p = 0;
208
208
 
209
 
        if (strcmp(path, "/index.html") == 0
210
 
                || strcmp(path, "/") == 0) {
 
209
        if (strcmp(path, "/index.html") == 0 || strcmp(path, "/") == 0) {
211
210
                safe_puts(index_page);
212
211
                return -1;
213
212
        }
301
300
                        rval = select(connsock + 1, &readfds, NULL, NULL, &tv);
302
301
                if (rval > 0) {
303
302
                        break;
304
 
                } else if (rval == 0) {
 
303
                }
 
304
                else if (rval == 0) {
305
305
                        return -1;
306
 
                } else if (rval < 0) {
 
306
                }
 
307
                else if (rval < 0) {
307
308
                        if (!select_was_interrupted_by_signal()) {
308
309
                                return -1;
309
310
                        }