Skip to content

Adjust all THttpServer source with travis #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bellenot merged 6 commits into from
Apr 11, 2017
Merged

Adjust all THttpServer source with travis #496

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ba6029
http: reformat sources, use doxygen comments style
linev Apr 10, 2017
b3ba78c
merge last commit
linev Apr 10, 2017
fbb4998
http: use UInt_t instead of void* for websocket ID
linev Apr 10, 2017
7fba785
http: remove code for webcanvas prototype
linev Apr 11, 2017
690873c
http: apply clang-format to all sources
linev Apr 11, 2017
4d41cca
http: last change to make travis CI happy
linev Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
http: reformat sources, use doxygen comments style
  • Loading branch information
@linev
linev committed Apr 10, 2017
commit 6ba6029489919b63932d5b623ef241bd2ec2e47f
28 changes: 14 additions & 14 deletions net/http/inc/TCivetweb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
// $Id$
// Author: Sergey Linev 21/12/2013

/*************************************************************************
* Copyright (C) 1995-2013, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_TCivetweb
#define ROOT_TCivetweb

Expand All @@ -9,28 +17,20 @@

class TCivetweb : public THttpEngine {
protected:
void *fCtx; //! civetweb context
void *fCallbacks; //! call-back table for civetweb webserver
TString fTopName; //! name of top item
Bool_t fDebug; //! debug mode
void *fCtx; ///<! civetweb context
void *fCallbacks; ///<! call-back table for civetweb webserver
TString fTopName; ///<! name of top item
Bool_t fDebug; ///<! debug mode

public:
TCivetweb();
virtual ~TCivetweb();

virtual Bool_t Create(const char *args);

const char *GetTopName() const
{
return fTopName.Data();
}

Bool_t IsDebugMode() const
{
// indicates that
const char *GetTopName() const { return fTopName.Data(); }

return fDebug;
}
Bool_t IsDebugMode() const { return fDebug; }

Int_t ProcessLog(const char* message);

Expand Down
21 changes: 13 additions & 8 deletions net/http/inc/TFastCgi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
// $Id$
// Author: Sergey Linev 28/12/2013

/*************************************************************************
* Copyright (C) 1995-2013, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifndef ROOT_TFastCgi
#define ROOT_TFastCgi

Expand All @@ -10,18 +18,15 @@ class TThread;

class TFastCgi : public THttpEngine {
protected:
Int_t fSocket; //! socket used by fastcgi
Bool_t fDebugMode; //! debug mode, may required for fastcgi debugging in other servers
TString fTopName; //! name of top item
TThread *fThrd; //! thread which takes requests, can be many later
Int_t fSocket; ///<! socket used by fastcgi
Bool_t fDebugMode; ///<! debug mode, may required for fastcgi debugging in other servers
TString fTopName; ///<! name of top item
TThread *fThrd; ///<! thread which takes requests, can be many later
public:
TFastCgi();
virtual ~TFastCgi();

Int_t GetSocket() const
{
return fSocket;
}
Int_t GetSocket() const { return fSocket; }

virtual Bool_t Create(const char *args);

Expand Down
Loading