Check-in [da7a22ae97]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fixed a bug in the "sockets.asm". Fixed the uConfig arguments change in FreshLib.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:da7a22ae97ed5a2da0b6edcac7c9ce72352e2d54
User & Date: lhmnai0 2014-07-16 09:08:09
Context
2015-12-02
13:28
Added options for proper compilation on 64bit Linux. check-in: 4d67e13957 user: johnfound tags: trunk
2014-07-16
09:08
Fixed a bug in the "sockets.asm". Fixed the uConfig arguments change in FreshLib. check-in: da7a22ae97 user: lhmnai0 tags: trunk
2014-03-17
16:42
Adapted to the latest API changes in FreshLibDev. check-in: 5deb74c177 user: johnfound tags: trunk
Changes

Changes to phWeb/phWeb.asm.

46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
; ================== Loading config file ===================

; procedure load and parse configuration data
proc LoadConfiguration
begin
        pushad

        stdcall CfgGetInt, cDefaultConfig, 'Binding.BindPort', 8080
        mov     [cfgBindPort], eax

        stdcall CfgGetInt, cDefaultConfig, 'Binding.BindIP', $7f000001
        mov     [cfgBindIp], eax

        stdcall CfgGetStr, cDefaultConfig, 'WebSite.DocumentRoot'
        jnc     .save_root
        stdcall StrNew
        stdcall StrCharCat, '.'
.save_root:
        mov     [cfgRoot], eax
        stdcall StrClipSpacesR, [cfgRoot]
        stdcall StrClipSpacesL, [cfgRoot]







|


|


|







46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
; ================== Loading config file ===================

; procedure load and parse configuration data
proc LoadConfiguration
begin
        pushad

        stdcall CfgGetInt, cDefaultConfig, 'Binding', 'BindPort', 8080
        mov     [cfgBindPort], eax

        stdcall CfgGetInt, cDefaultConfig, 'Binding', 'BindIP', $7f000001
        mov     [cfgBindIp], eax

        stdcall CfgGetStr, cDefaultConfig, 'WebSite', 'DocumentRoot'
        jnc     .save_root
        stdcall StrNew
        stdcall StrCharCat, '.'
.save_root:
        mov     [cfgRoot], eax
        stdcall StrClipSpacesR, [cfgRoot]
        stdcall StrClipSpacesL, [cfgRoot]

Changes to phWeb/phWeb.conf.

1
2
3
4
Binding.BindIP   = $7f000001
Binding.BindPort = 7000

WebSite.DocumentRoot = "./www"

|


1
2
3
4
Binding.BindIP   = $7f000001
Binding.BindPort = 8000

WebSite.DocumentRoot = "./www"

Changes to phWeb/phWeb.exe.

cannot compute difference between binary files

Changes to phWeb/sockets.asm.

120
121
122
123
124
125
126


127
128
129
130
131
132
133
proc ConnectionHandler, .hSocket
  .buffer   dd ?
  .pHeaders dd ?
  .hCurrent dd ?
  .expect_next dd ?
begin
        pushad



        stdcall StrNew
        mov     [.hCurrent], eax

        stdcall CreateArray, 4
        mov     [.pHeaders], eax








>
>







120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
proc ConnectionHandler, .hSocket
  .buffer   dd ?
  .pHeaders dd ?
  .hCurrent dd ?
  .expect_next dd ?
begin
        pushad

        mov     [.expect_next], 0

        stdcall StrNew
        mov     [.hCurrent], eax

        stdcall CreateArray, 4
        mov     [.pHeaders], eax