Skip to content

Commit c326e43

Browse files
author
SVN Migration
committed
This commit was manufactured by cvs2svn to create branch 'PHP_4_2_0'.
1 parent d0e7ff7 commit c326e43

File tree

9 files changed

+920
-0
lines changed

9 files changed

+920
-0
lines changed

‎ext/exif/tests/005.phpt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--TEST--
2+
Check for exif_read_data, unusual IFD start
3+
--SKIPIF--
4+
<?php if (!extension_loaded("exif")) print "skip";?>
5+
--FILE--
6+
<?php
7+
/*
8+
test5.jpg is a 1*1 image that contain an Exif section with ifd start at 00000009h
9+
*/
10+
$image = exif_read_data('./ext/exif/tests/test5.jpg','',true,false);
11+
var_dump($image['IFD0']);
12+
?>
13+
--EXPECT--
14+
array(2) {
15+
["ImageDescription"]=>
16+
string(11) "Ifd00000009"
17+
["DateTime"]=>
18+
string(19) "2002:10:18 20:06:00"
19+
}

‎ext/exif/tests/test5.jpg

603 Bytes
Loading

‎ext/ldap/ldap.mak

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
# Temporarily here -- later may go into some batch file
2+
# which will set this as an environment variable
3+
PROJECT_ROOT = ..\..
4+
5+
# Module details
6+
MODULE_NAME = php_ldap
7+
MODULE_DESC = "PHP LDAP Extension"
8+
VMAJ = 0
9+
VMIN = 60
10+
VREV = 1
11+
12+
#include the common settings
13+
include $(PROJECT_ROOT)/netware/common.mif
14+
15+
# Extensions of all input and output files
16+
.SUFFIXES:
17+
.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
18+
19+
# Source files
20+
C_SRC = ldap.c \
21+
start.c
22+
23+
CPP_SRC_NODIR = $(notdir $(CPP_SRC))
24+
C_SRC_NODIR = $(notdir $(C_SRC))
25+
SRC_DIR = $(dir $(CPP_SRC) $(C_SRC))
26+
27+
# Library files
28+
LIBRARY =
29+
30+
# Destination directories and files
31+
OBJ_DIR = $(BUILD)
32+
FINAL_DIR = $(BUILD)
33+
MAP_FILE = $(FINAL_DIR)\$(MODULE_NAME).map
34+
OBJECTS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.obj) $(C_SRC_NODIR:.c=.obj))
35+
DEPDS = $(addprefix $(OBJ_DIR)/,$(CPP_SRC_NODIR:.c=.d) $(C_SRC_NODIR:.c=.d))
36+
37+
# Binary file
38+
ifndef BINARY
39+
BINARY=$(FINAL_DIR)\$(MODULE_NAME).nlm
40+
endif
41+
42+
# Compile flags
43+
C_FLAGS += -c -maxerrors 25 -msgstyle gcc
44+
C_FLAGS += -wchar_t on -bool on
45+
C_FLAGS += -processor Pentium
46+
C_FLAGS += -nostdinc -nosyspath
47+
C_FLAGS += -DNETWARE -DZTS
48+
C_FLAGS += -DNEW_LIBC
49+
C_FLAGS += -DCOMPILE_DL_LDAP -DCOMPILE_DL=1
50+
C_FLAGS += -I. -I$(PROJECT_ROOT)/main -I$(PROJECT_ROOT)/ext/standard -I$(PROJECT_ROOT) -I$(PROJECT_ROOT)/netware
51+
C_FLAGS += -I$(PROJECT_ROOT)/zend -I$(PROJECT_ROOT)/tsrm
52+
C_FLAGS += -I- -I$(SDK_DIR)/include -I$(MWCIncludes)
53+
C_FLAGS += -I$(LDAP_DIR)/inc
54+
C_FLAGS += -I$(WINSOCK_DIR)/include/nlm -I$(WINSOCK_DIR)/include
55+
56+
ifndef STACK_SIZE
57+
STACK_SIZE=8192
58+
endif
59+
60+
# Extra stuff based on debug / release builds
61+
ifeq '$(BUILD)' 'debug'
62+
SYM_FILE = $(FINAL_DIR)\$(MODULE_NAME).sym
63+
C_FLAGS += -inline smart -sym on -sym codeview4 -opt off -opt intrinsics -sym internal -DDEBUGGING -DDKFBPON
64+
C_FLAGS += -exc cw -DZEND_DEBUG=1
65+
LD_FLAGS += -sym on -sym codeview4 -osym $(SYM_FILE)
66+
export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtld.lib
67+
else
68+
C_FLAGS += -opt speed -inline on -inline smart -inline auto -sym off
69+
C_FLAGS += -opt intrinsics
70+
C_FLAGS += -opt level=4 -DZEND_DEBUG=0
71+
LD_FLAGS += -sym off
72+
export MWLibraryFiles=$(SDK_DIR)/imports/libcpre.o;mwcrtl.lib
73+
endif
74+
75+
# Dependencies
76+
MODULE = LibC \
77+
ldapsdk \
78+
phplib
79+
IMPORT = @$(SDK_DIR)/imports/libc.imp \
80+
@$(SDK_DIR)/imports/ws2nlm.imp \
81+
@$(MPK_DIR)/import/mpkOrg.imp \
82+
@$(LDAP_DIR)/lib/nlm/Ldapsdk.imp \
83+
@$(PROJECT_ROOT)/netware/phplib.imp
84+
#EXPORT = get_module
85+
#EXPORT = ldap_functions \
86+
# ldap_module_entry \
87+
# ($(MODULE_NAME).nlm) get_module
88+
EXPORT = ($(MODULE_NAME)) get_module
89+
API = OutputToScreen
90+
91+
92+
# Virtual paths
93+
vpath %.cpp .
94+
vpath %.c . ..\..\netware
95+
vpath %.obj $(OBJ_DIR)
96+
97+
98+
all: prebuild project
99+
100+
.PHONY: all
101+
102+
prebuild:
103+
@if not exist $(OBJ_DIR) md $(OBJ_DIR)
104+
105+
project: $(BINARY)
106+
@echo Build complete.
107+
108+
$(OBJ_DIR)/%.d: %.cpp
109+
@echo Building Dependencies for $(<F)
110+
@$(CC) -M $< $(C_FLAGS) -o $@
111+
112+
$(OBJ_DIR)/%.d: %.c
113+
@echo Building Dependencies for $(<F)
114+
@$(CC) -M $< $(C_FLAGS) -o $@
115+
116+
$(OBJ_DIR)/%.obj: %.cpp
117+
@echo Compiling $?...
118+
@$(CC) $< $(C_FLAGS) -o $@
119+
120+
$(OBJ_DIR)/%.obj: %.c
121+
@echo Compiling $?...
122+
@$(CC) $< $(C_FLAGS) -o $@
123+
124+
125+
$(BINARY): $(DEPDS) $(OBJECTS)
126+
@echo Import $(IMPORT) > $(basename $@).def
127+
ifdef API
128+
@echo Import $(API) >> $(basename $@).def
129+
endif
130+
@echo Module $(MODULE) >> $(basename $@).def
131+
ifdef EXPORT
132+
@echo Export $(EXPORT) >> $(basename $@).def
133+
endif
134+
@echo AutoUnload >> $(basename $@).def
135+
ifeq '$(BUILD)' 'debug'
136+
@echo Debug >> $(basename $@).def
137+
endif
138+
@echo Flag_On 0x00000008 >> $(basename $@).def
139+
@echo Start _NonAppStart >> $(basename $@).def
140+
@echo Exit _NonAppStop >> $(basename $@).def
141+
142+
$(MPKTOOL) $(XDCFLAGS) $(basename $@).xdc
143+
@echo xdcdata $(basename $@).xdc >> $(basename $@).def
144+
145+
@echo Linking $@...
146+
@echo $(LD_FLAGS) -commandfile $(basename $@).def > $(basename $@).link
147+
@echo $(LIBRARY) $(OBJECTS) >> $(basename $@).link
148+
149+
@$(LINK) @$(basename $@).link
150+
151+
152+
.PHONY: clean
153+
clean: cleand cleanobj cleanbin
154+
155+
.PHONY: cleand
156+
cleand:
157+
@echo Deleting all dependency files...
158+
-@del "$(OBJ_DIR)\*.d"
159+
160+
.PHONY: cleanobj
161+
cleanobj:
162+
@echo Deleting all object files...
163+
-@del "$(OBJ_DIR)\*.obj"
164+
165+
.PHONY: cleanbin
166+
cleanbin:
167+
@echo Deleting binary files...
168+
-@del "$(FINAL_DIR)\$(MODULE_NAME).nlm"
169+
@echo Deleting MAP, DEF files, etc....
170+
-@del "$(FINAL_DIR)\$(MODULE_NAME).map"
171+
-@del "$(FINAL_DIR)\$(MODULE_NAME).def"
172+
-@del "$(FINAL_DIR)\$(MODULE_NAME).link"
173+
ifeq '$(BUILD)' 'debug'
174+
-@del $(FINAL_DIR)\$(MODULE_NAME).sym
175+
endif

‎netware/buildlib.bat

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@echo off
2+
3+
cd ..
4+
5+
if "%1" == "clean" make -f netware\phplib.mak clean
6+
if "%1" == "/?" goto USAGE
7+
8+
REM Build command
9+
make -f netware\phplib.mak
10+
goto EXIT
11+
12+
:USAGE
13+
@echo on
14+
@echo Usage: buildlib [clean]
15+
@echo clean - delete all object files and binaries before building
16+
17+
:EXIT
18+
cd netware

‎netware/php-nw.bat

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@echo off
2+
3+
REM CodeWarrior stuff
4+
set path=%path%;P:\APPS\SCRIPT\SW\CW71-4\BIN
5+
6+
REM Cygwin stuff
7+
REM set path=%path%;R:\SCRIPT\PHP\CYGWIN\BIN
8+
REM set CYGWIN=R:\SCRIPT\PHP\CYGWIN
9+
10+
REM Tools for building Zend
11+
set path=%path%;P:\APPS\SCRIPT\SW\GNUWIN32\BIN
12+
13+
REM Build options
14+
REM set BUILD=release
15+
setbuild r 1

‎netware/phplib.imp

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
_array_init,
2+
_convert_to_string,
3+
_efree,
4+
_emalloc,
5+
_estrdup,
6+
_estrndup,
7+
_object_init,
8+
_object_init_ex,
9+
_persist_alloc,
10+
_zend_get_parameters_array,
11+
_zend_list_addref,
12+
_zend_list_delete,
13+
_zend_list_find,
14+
_zval_copy_ctor,
15+
_zval_dtor,
16+
add_assoc_long_ex,
17+
add_index_null,
18+
add_index_long,
19+
add_assoc_string_ex,
20+
add_assoc_stringl_ex,
21+
add_assoc_null_ex,
22+
add_index_string,
23+
add_index_stringl,
24+
add_next_index_bool,
25+
add_next_index_long,
26+
add_next_index_string,
27+
add_next_index_stringl,
28+
add_property_long_ex,
29+
add_property_string_ex,
30+
compiler_globals_id,
31+
convert_to_boolean,
32+
convert_to_long,
33+
core_globals_id,
34+
display_ini_entries,
35+
display_link_numbers,
36+
empty_string,
37+
executor_globals_id,
38+
expand_filepath,
39+
get_zend_version,
40+
get_active_function_name,
41+
highlight_file,
42+
le_index_ptr,
43+
module_registry,
44+
open_file_for_scanning,
45+
_object_and_properties_init,
46+
php_addslashes,
47+
php_checkuid,
48+
php_execute_script,
49+
php_fopen_primary_script,
50+
php_handle_aborted_connection,
51+
php_handle_special_queries,
52+
php_body_write,
53+
php_end_ob_buffers,
54+
php_get_current_user,
55+
php_get_highlight_struct,
56+
php_handle_auth_data,
57+
php_header,
58+
php_header_write,
59+
php_import_environment_variables,
60+
php_info_print_table_end,
61+
php_info_print_table_colspan_header,
62+
php_info_print_table_header,
63+
php_info_print_table_row,
64+
php_info_print_table_start,
65+
php_lint_script,
66+
php_log_err,
67+
php_module_shutdown,
68+
php_module_shutdown_for_exec,
69+
php_module_shutdown_wrapper,
70+
php_module_startup,
71+
php_output_activate,
72+
php_output_set_status,
73+
php_output_startup,
74+
php_print_info,
75+
php_printf,
76+
php_register_variable,
77+
php_request_shutdown,
78+
php_request_shutdown_for_exec,
79+
php_request_startup,
80+
php_strlcpy,
81+
php_strtolower,
82+
sapi_free_header,
83+
sapi_get_default_content_type,
84+
sapi_globals_id,
85+
sapi_shutdown,
86+
sapi_startup,
87+
ts_allocate_id,
88+
ts_resource_ex,
89+
tsrm_shutdown,
90+
tsrm_startup,
91+
virtual_fopen,
92+
zend_alter_ini_entry,
93+
zend_error,
94+
zend_execute_scripts,
95+
zend_fetch_resource,
96+
zend_get_parameters_ex,
97+
zend_hash_add_or_update,
98+
zend_hash_apply,
99+
zend_hash_apply_with_argument,
100+
zend_hash_del_key_or_index,
101+
zend_hash_destroy,
102+
zend_hash_exists,
103+
zend_hash_find,
104+
zend_hash_get_current_key_ex,
105+
zend_hash_get_current_data_ex,
106+
zend_hash_index_find,
107+
zend_hash_index_update_or_next_insert,
108+
zend_hash_init,
109+
zend_hash_internal_pointer_reset_ex
110+
zend_hash_merge_ex,
111+
zend_hash_move_forward_ex,
112+
zend_hash_num_elements,
113+
zend_highlight,
114+
zend_ini_deactivate,
115+
zend_ini_boolean_displayer_cb,
116+
zend_list_insert,
117+
zend_llist_add_element,
118+
zend_llist_apply,
119+
zend_llist_destroy,
120+
zend_llist_init,
121+
zend_load_extension,
122+
zend_parse_parameters,
123+
zend_printf,
124+
zend_register_ini_entries,
125+
zend_register_internal_class,
126+
zend_register_list_destructors_ex,
127+
zend_register_long_constant,
128+
zend_register_resource,
129+
zend_startup_module,
130+
zend_standard_class_def,
131+
zend_unregister_ini_entries,
132+
zend_wrong_param_count,
133+
OnUpdateInt,
134+
OnUpdateString,
135+
OnUpdateStringUnempty

0 commit comments

Comments
 (0)