Check-in [047343ff0e]
Not logged in

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

Overview
Comment:Changed the use of uConfig library, because of changed API. Latest FreshLibDev have to be use for compilation.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:047343ff0e3d390b55492078cd97fcc78eccef36
User & Date: JohnFound 2013-01-12 20:43:21
Context
2014-03-17
16:42
Adapted to the latest API changes in FreshLibDev. check-in: 5deb74c177 user: johnfound tags: trunk
2013-01-12
20:43
Changed the use of uConfig library, because of changed API. Latest FreshLibDev have to be use for compilation. check-in: 047343ff0e user: JohnFound tags: trunk
2013-01-09
18:29
Code cleanup. Changed the format of the configuration file. (but this is not the latest version of uConfig, so another change will be provided later).

Now the server almost works in KolibriOS (but only with the new network stack, developed by hidnplayr). check-in: 16caabe748 user: JohnFound tags: trunk

Changes

Changes to phWeb/phWeb.

cannot compute difference between binary files

Changes to phWeb/phWeb.asm.

42
43
44
45
46
47
48

49
50
51
52
53
54

55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
..
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
        FinalizeAll
        stdcall TerminateAll, 0

; ================== Loading config file ===================

; procedure load and parse configuration data
proc LoadConfiguration

begin
        pushad

        stdcall StrLoadFromFile, cDefaultConfig
        jc      .error_open_file


        mov     esi, eax

        stdcall GetConfigInt, esi, 'Binding', 'BindPort'
        jnc     .save_port
        mov     eax, 8080
.save_port:
        mov     [cfgBindPort], eax

        stdcall GetConfigInt, esi, 'Binding', 'BindIP'
        jnc     .save_addr
        mov     eax, $7f000001
.save_addr:
        mov     [cfgBindIp], eax

        stdcall GetConfigRecord, esi, 'WebSite', 'DocumentRoot'
        jnc     .save_root
        stdcall StrNew
        stdcall StrCharCat, '.'
.save_root:
        mov     [cfgRoot], eax
        stdcall StrClipSpacesR, [cfgRoot]
        stdcall StrClipSpacesL, [cfgRoot]
................................................................................
        mov     ecx, eax
        stdcall StrPtr, [cfgRoot]
        cmp     byte [eax+ecx-1], DIR_SLASH
        je      .root_ok
        stdcall StrCharCat, [cfgRoot], DIR_SLASH
.root_ok:

        stdcall StrDel, esi

        popad
        return

.error_open_file:
        mov     dword [cfgBindIp], $7f000001
        mov     dword [cfgBindPort], 8080







>



|
<

>
|

|





|





|







 







|







42
43
44
45
46
47
48
49
50
51
52
53

54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
..
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
        FinalizeAll
        stdcall TerminateAll, 0

; ================== Loading config file ===================

; procedure load and parse configuration data
proc LoadConfiguration
.config TConfig
begin
        pushad

        lea     esi, [.config]


        stdcall CfgLoad, esi, cDefaultConfig
        jc      .error_open_file

        stdcall CfgGetInt, esi, 'Binding:BindPort'
        jnc     .save_port
        mov     eax, 8080
.save_port:
        mov     [cfgBindPort], eax

        stdcall CfgGetInt, esi, 'Binding:BindIP'
        jnc     .save_addr
        mov     eax, $7f000001
.save_addr:
        mov     [cfgBindIp], eax

        stdcall CfgGetRecord, esi, 'WebSite:DocumentRoot'
        jnc     .save_root
        stdcall StrNew
        stdcall StrCharCat, '.'
.save_root:
        mov     [cfgRoot], eax
        stdcall StrClipSpacesR, [cfgRoot]
        stdcall StrClipSpacesL, [cfgRoot]
................................................................................
        mov     ecx, eax
        stdcall StrPtr, [cfgRoot]
        cmp     byte [eax+ecx-1], DIR_SLASH
        je      .root_ok
        stdcall StrCharCat, [cfgRoot], DIR_SLASH
.root_ok:

        stdcall CfgClean, esi

        popad
        return

.error_open_file:
        mov     dword [cfgBindIp], $7f000001
        mov     dword [cfgBindPort], 8080

Changes to phWeb/phWeb.exe.

cannot compute difference between binary files

Changes to phWeb/phWeb.fpr.

cannot compute difference between binary files

Changes to phWeb/phWeb.kex.

cannot compute difference between binary files