~ubuntu-branches/ubuntu/feisty/lighttpd/feisty-security

« back to all changes in this revision

Viewing changes to src/mod_accesslog.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-03-20 13:53:07 UTC
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: james.westby@ubuntu.com-20060320135307-800byq9gi3r5y6zh
Tags: upstream-1.4.11
Import upstream version 1.4.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
334
334
                        if (s->access_logbuffer->used) {
335
335
                                if (s->use_syslog) {
336
336
# ifdef HAVE_SYSLOG_H
337
 
                                        syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 1, s->access_logbuffer->ptr);
 
337
                                        if (s->access_logbuffer->used > 2) {
 
338
                                                syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 2, s->access_logbuffer->ptr);
 
339
                                        }
338
340
# endif
339
341
                                } else if (s->log_access_fd != -1) {
340
342
                                        write(s->log_access_fd, s->access_logbuffer->ptr, s->access_logbuffer->used - 1);
534
536
                if (s->access_logbuffer->used) {
535
537
                        if (s->use_syslog) {
536
538
#ifdef HAVE_SYSLOG_H
537
 
                                syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 1, s->access_logbuffer->ptr);
 
539
                                if (s->access_logbuffer->used > 2) {
 
540
                                        /* syslog appends a \n on its own */
 
541
                                        syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 2, s->access_logbuffer->ptr);
 
542
                                }
538
543
#endif
539
544
                        } else if (s->log_access_fd != -1) {
540
545
                                write(s->log_access_fd, s->access_logbuffer->ptr, s->access_logbuffer->used - 1);
813
818
            b->used > BUFFER_MAX_REUSE_SIZE) {
814
819
                if (p->conf.use_syslog) {
815
820
#ifdef HAVE_SYSLOG_H
816
 
                        syslog(LOG_INFO, "%*s", b->used - 1, b->ptr);
 
821
                        if (b->used > 2) {
 
822
                                /* syslog appends a \n on its own */
 
823
                                syslog(LOG_INFO, "%*s", b->used - 2, b->ptr);
 
824
                        }
817
825
#endif
818
826
                } else if (p->conf.log_access_fd != -1) {
819
827
                        write(p->conf.log_access_fd, b->ptr, b->used - 1);