Diff for /Amaya/amaya/libwww.h between versions 1.14 and 1.15

version 1.14, 1998/03/11 17:24:45 version 1.15, 1998/07/24 17:05:24
Line 8 Line 8
 #ifndef AMAYA_LIBWWW_H  #ifndef AMAYA_LIBWWW_H
 #define AMAYA_LIBWWW_H  #define AMAYA_LIBWWW_H
   
   /***********
   Things to put in sysdep.h???
   **********/
   /*typedef u_long SockOps; */
   #ifndef _WINSOCKAPI_
   #define FD_READ         0x01
   #define FD_WRITE        0x02
   #define FD_OOB          0x04
   #define FD_ACCEPT       0x08
   #define FD_CONNECT      0x10
   #define FD_CLOSE        0x20
   #endif /* _WINSOCKAPI_ */
   typedef unsigned long ms_t;
   /************/
   
 #include "WWWLib.h"  #include "WWWLib.h"
 #include "WWWApp.h"  #include "WWWApp.h"
Line 17 Line 31
 #include "HTReq.h"  #include "HTReq.h"
 #include "HTAncMan.h"  #include "HTAncMan.h"
 #include "HTAccess.h"  #include "HTAccess.h"
 #include "HTEvntrg.h"  
 #include "HTAlert.h"  #include "HTAlert.h"
 #include "HTNetMan.h"  #include "HTNetMan.h"
 #include "HTBInit.h"  #include "HTBInit.h"
Line 25 Line 38
 #include "HTProxy.h"  #include "HTProxy.h"
 #include "HTHost.h"  #include "HTHost.h"
   
 /* a definition missing in HTHost.h ! */  
 extern int HTHost_catchClose (SOCKET soc, HTRequest * request, SockOps ops);  
   
 typedef struct _AHTDocIdStatus  typedef struct _AHTDocIdStatus
   {    {
      int                 docid; /* a docid */       int                 docid; /* a docid */
Line 40  typedef struct __AmayaContext Line 50  typedef struct __AmayaContext
   {    {
      HTList             *reqlist;       /* List of current requests */       HTList             *reqlist;       /* List of current requests */
      HTList             *docid_status;  /* Status for each active docid */       HTList             *docid_status;  /* Status for each active docid */
      int                 open_requests;         /* number of open requests */       int                 open_requests; /* number of open requests */
       boolean              cache;         /* cache active */
   }    }
 AmayaContext;  AmayaContext;
   
Line 54  typedef enum _AHTReqStatus Line 65  typedef enum _AHTReqStatus
      HT_BUSY = 4,         /* the request is currently being processed */       HT_BUSY = 4,         /* the request is currently being processed */
      HT_END = 8,          /* the request has ended */       HT_END = 8,          /* the request has ended */
      HT_ABORT = 16,       /* user aborted the request */       HT_ABORT = 16,       /* user aborted the request */
      HT_ERR = 32          /* an error happened during the request */       HT_CACHE = 32,
        HT_ERR = 64          /* an error happened during the request */
   }    }
 AHTReqStatus;  AHTReqStatus;
   
Line 69  typedef struct _AHTReqContext Line 81  typedef struct _AHTReqContext
      HTMethod            method;        /* What method are we envoking                  */       HTMethod            method;        /* What method are we envoking                  */
      int                 docid;         /* docid to which this request belongs          */       int                 docid;         /* docid to which this request belongs          */
      AHTReqStatus        reqStatus;     /* status of the request                        */       AHTReqStatus        reqStatus;     /* status of the request                        */
      SockOps             read_ops;      /* The ops operation which must be used during       HTEventType             read_type; /* The type operation which must be used during
                                            ** an Xt read callback */                                             ** an Xt read callback */
   
      SockOps             write_ops;     /* The ops operation which must be used during       HTEventType             write_type;        /* The type operation which must be used during
                                            ** an Xt write callback */                                             ** an Xt write callback */
   
      SockOps             except_ops;    /* The ops operation which must be used during       HTEventType             except_type;       /* The type operation which must be used during
                                            ** an Xt exception callback */                                             ** an Xt exception callback */
   
 #ifdef WWW_XWINDOWS  #ifdef WWW_XWINDOWS
Line 115  typedef struct _AHTReqContext Line 127  typedef struct _AHTReqContext
   
      HTParentAnchor     *dest;  /* Destination for PUT etc.              */       HTParentAnchor     *dest;  /* Destination for PUT etc.              */
      unsigned long       block_size;    /* size in bytes of the file to put      */       unsigned long       block_size;    /* size in bytes of the file to put      */
      int                 put_counter;   /* number of bytes already put           */      int                 put_counter;    /* number of bytes already put           */
      char               *mem_ptr;       /* ptr to a struct in mem which contains a copy */      char               *mem_ptr;        /* ptr to a struct in mem which contains a copy */
      /* of the file to put                           */       /* of the file to put                           */
   
       HTAssocList        *formdata;        /* ptr to a struct containing the formdata used with POST */
   
      char               *error_stream;        /* pointer to an error message associated with the       char               *error_stream;        /* pointer to an error message associated with the
                                                  request */                                                   request */
      int                 error_stream_size;   /* size of the above message */       int                 error_stream_size;   /* size of the above message */
Line 132  THOT_EXPORT HTList      *conv; /* List o Line 147  THOT_EXPORT HTList      *conv; /* List o
 THOT_EXPORT AmayaContext *Amaya;        /* Amaya's request global context    */  THOT_EXPORT AmayaContext *Amaya;        /* Amaya's request global context    */
   
 #endif /* AMAYA_LIBWWW_H */  #endif /* AMAYA_LIBWWW_H */
   

Removed from v.1.14  
changed lines
  Added in v.1.15


Webmaster