[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Thu Jan 16 20:35:24 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1237 php4/ChangeLog:1.1238 --- php4/ChangeLog:1.1237 Wed Jan 15 20:33:18 2003 +++ php4/ChangeLog Thu Jan 16 20:35:23 2003 @@ -1,3 +1,127 @@ +2003-01-16 Harald Radi [EMAIL PROTECTED] + +* main/config.w32.h + main/internal_functions_win32.c: + move the ZE2 check into internal_functions_win32.c + +* ext/bcmath/libbcmath/src/config.h: + revert previous commit + +* ext/bcmath/libbcmath/src/config.h: + unbreak the build + +2003-01-16 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/pdf/pdf.c: + Fixed bug #21651 (crash in pdf_open_memory_image() when inserting a + non truecolor image). + +2003-01-16 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/standard/filters.c: + Finally fixed a qp encoder bug that line break characters that appear + exactly + at the end of the chunk lost in the output. + +2003-01-16 Marcus Boerger [EMAIL PROTECTED] + +* ext/standard/tests/image/getimagesize.phpt + ext/standard/tests/image/image_type_to_mime_type.phpt: + - JPEG 2000 support + +* ext/standard/image.c + ext/standard/php_image.h: + - corrected error in file detection for very small files + - JPEG 2000 support, mostly Adam Wright [EMAIL PROTECTED] + +2003-01-16 Harald Radi [EMAIL PROTECTED] + +* ext/rpc/java/java.dsp: + change library name + +* ext/rpc/skeleton/php_skeleton.h + ext/rpc/skeleton/skeleton.c + ext/rpc/skeleton/skeleton.h: + update skeleton + +* win32/php4dllts.dsp: + fix path to config.w32.h + +* main/internal_functions_win32.c: + add COM + +* main/config.w32.h: + prevent HEAD + ZE1 builds and add COM + +* ext/rpc/com/com.dsp: + for those who prefer to have com as a shared lib + +2003-01-16 Sascha Schumann [EMAIL PROTECTED] + +* (PHP_4) + configure.in + main/php_version.h: + Open up the PHP_4 branch which has been derived from the current PHP_4_3 + branch, so we don't introduce any ZE2-related changes. + + This branch has the purpose of housing experimental patches in the + context of PHP 4/ZE1. Patches which don't qualify as bug fixes + should not be committed to the PHP_4_3 branch. + + Note: The code on this branch is unlikely to be ever released in the form +of a standard PHP release. Commit new features to the HEAD branch! +Patches for this branch should be the exception. + + Note: The version is 4.5.0, because 4.4.0 has been used for some time +in HEAD before being switched to 5.0.0. I would have used something +like 4.X.X, but letters are not really supported by the current +system. + +2003-01-16 Harald Radi [EMAIL PROTECTED] + +* ext/rpc/handler.h + ext/rpc/layer.h + ext/rpc/php_rpc.h + ext/rpc/rpc.c + ext/rpc/rpc.h + ext/rpc/com/com.c + ext/rpc/com/com.h + ext/rpc/com/php_com.h + ext/rpc/skeleton/skeleton.c + ext/rpc/skeleton/skeleton.h: + make layers loadable as self-sustaining php extension + which registeres itself in the rpc framework. + +2003-01-16 Dan Kalowsky [EMAIL PROTECTED] + +* ext/odbc/php_odbc.h: + typo corrected + +* ext/odbc/php_odbc.c + ext/odbc/php_odbc.h: + Adding in test ability for WIndows to fetch_objects + +2003-01-16 Edin Kadribasic [EMAIL PROTECTED] + +* ext/standard/math.c: + Fixed bug #21648 + +2003-01-16 Sascha Schumann [EMAIL PROTECTED] + +* php.ini-dist + php.ini-recommended + ext/session/mod_files.c + ext/session/php_session.h + ext/session/session.c: + Add INI setting session.hash_bits_per_character which enables developers + to choose how session ids are represented, regardless of the hash + algorithm. + +2003-01-16 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/oracle/oracle.c: + Fixed bug #20079 (made ora_logoff return TRUE on success). + 2003-01-15 Edin Kadribasic [EMAIL PROTECTED] * win32/php_modules.dsw:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Jan 16 20:36:11 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.148 ZendEngine2/ChangeLog:1.149 --- ZendEngine2/ChangeLog:1.148 Wed Jan 15 20:33:30 2003 +++ ZendEngine2/ChangeLog Thu Jan 16 20:36:11 2003 @@ -1,3 +1,8 @@ +2003-01-16 Ilia Alshanetsky [EMAIL PROTECTED] + +* zend_execute.c: + Fixed bug #20933 (isset/empty didn't work when used on string offsets). + 2003-01-15 Andi Gutmans [EMAIL PROTECTED] * zend_compile.c:
[PHP-CVS-DAILY] cvs: php4 / NEWS
changelog Thu Jan 16 20:37:03 2003 EDT Modified files: /php4 NEWS Log: NEWS update Index: php4/NEWS diff -u php4/NEWS:1.1308 php4/NEWS:1.1309 --- php4/NEWS:1.1308Sun Jan 12 07:45:18 2003 +++ php4/NEWS Thu Jan 16 20:37:02 2003 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 +- Enhanced jpeg 2000 support for GetImageSize(). (marcus, Adam Wright) - Fixed bug #20155: xmlrpc compile problem with zendengine2 (Derick, Jan Schneider) - Implemented string.base64 stream filter. (Moriyoshi)
[PHP-CVS] cvs: php4 /ext/standard math.c
edink Thu Jan 16 08:19:51 2003 EDT
Modified files:
/php4/ext/standard math.c
Log:
Fixed bug #21648
Index: php4/ext/standard/math.c
diff -u php4/ext/standard/math.c:1.101 php4/ext/standard/math.c:1.102
--- php4/ext/standard/math.c:1.101 Fri Jan 10 08:32:24 2003
+++ php4/ext/standard/math.cThu Jan 16 08:19:50 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.101 2003/01/10 13:32:24 wez Exp $ */
+/* $Id: math.c,v 1.102 2003/01/16 13:19:50 edink Exp $ */
#include php.h
#include php_math.h
@@ -1011,7 +1011,7 @@
/* allow for thousand separators */
if (thousand_sep) {
- integral += integral / 3;
+ integral += (integral-1) / 3;
}
reslen = integral;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard math.c
edink Thu Jan 16 08:21:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard math.c
Log:
MFH: recent fixes to number_format()
Index: php4/ext/standard/math.c
diff -u php4/ext/standard/math.c:1.97.2.3 php4/ext/standard/math.c:1.97.2.4
--- php4/ext/standard/math.c:1.97.2.3 Thu Jan 9 11:54:15 2003
+++ php4/ext/standard/math.cThu Jan 16 08:21:54 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.97.2.3 2003/01/09 16:54:15 iliaa Exp $ */
+/* $Id: math.c,v 1.97.2.4 2003/01/16 13:21:54 edink Exp $ */
#include php.h
#include php_math.h
@@ -1011,10 +1011,14 @@
/* allow for thousand separators */
if (thousand_sep) {
- integral += integral / 3;
+ integral += (integral-1) / 3;
}
- reslen = integral + 1 + dec;
+ reslen = integral;
+
+ if (dec) {
+ reslen += 1 + dec;
+ }
/* add a byte for minus sign */
if (is_negative) {
@@ -1034,21 +1038,24 @@
int topad = declen 0 ? dec - declen : 0;
/* pad with '0's */
+
while (topad--) {
*t-- = '0';
}
-
- /* now copy the chars after the point */
- memcpy(t - declen + 1, dp + 1, declen);
- t -= declen;
- s -= declen;
+ if (dp) {
+ /* now copy the chars after the point */
+ memcpy(t - declen + 1, dp + 1, declen);
+
+ t -= declen;
+ s -= declen;
+ }
/* add decimal point */
*t-- = dec_point;
s--;
}
-
+
/* copy the numbers before the decimal place, adding thousand
* separator every three digits */
while(s = tmpbuf) {
@@ -1064,7 +1071,7 @@
}
efree(tmpbuf);
-
+
return resbuf;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/odbc php_odbc.c php_odbc.h
kalowskyThu Jan 16 11:27:31 2003 EDT Modified files: /php4/ext/odbc php_odbc.c php_odbc.h Log: Adding in test ability for WIndows to fetch_objects Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.149 php4/ext/odbc/php_odbc.c:1.150 --- php4/ext/odbc/php_odbc.c:1.149 Tue Jan 7 19:38:36 2003 +++ php4/ext/odbc/php_odbc.cThu Jan 16 11:27:30 2003 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_odbc.c,v 1.149 2003/01/08 00:38:36 iliaa Exp $ */ +/* $Id: php_odbc.c,v 1.150 2003/01/16 16:27:30 kalowsky Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -84,7 +84,7 @@ PHP_FE(odbc_error, NULL) PHP_FE(odbc_errormsg, NULL) PHP_FE(odbc_exec, NULL) -#ifdef HAVE_DBMAKER +#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) PHP_FE(odbc_fetch_array, NULL) PHP_FE(odbc_fetch_object, NULL) #endif @@ -1346,7 +1346,7 @@ } /* }}} */ -#ifdef HAVE_DBMAKER +#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) #define ODBC_NUM 1 #define ODBC_OBJECT 2 Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.49 php4/ext/odbc/php_odbc.h:1.50 --- php4/ext/odbc/php_odbc.h:1.49 Tue Dec 31 11:07:09 2002 +++ php4/ext/odbc/php_odbc.hThu Jan 16 11:27:31 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_odbc.h,v 1.49 2002/12/31 16:07:09 sebastian Exp $ */ +/* $Id: php_odbc.h,v 1.50 2003/01/16 16:27:31 kalowsky Exp $ */ #ifndef PHP_ODBC_H #define PHP_ODBC_H @@ -54,7 +54,7 @@ PHP_FUNCTION(odbc_do); PHP_FUNCTION(odbc_exec); PHP_FUNCTION(odbc_execute); -#ifdef HAVE_DBMAKER +#if defined(HAVE_DBMAKER) || deifned(PHP_WIN32) PHP_FUNCTION(odbc_fetch_array); PHP_FUNCTION(odbc_fetch_object); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/odbc php_odbc.h
kalowskyThu Jan 16 11:42:25 2003 EDT Modified files: /php4/ext/odbc php_odbc.h Log: typo corrected Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.50 php4/ext/odbc/php_odbc.h:1.51 --- php4/ext/odbc/php_odbc.h:1.50 Thu Jan 16 11:27:31 2003 +++ php4/ext/odbc/php_odbc.hThu Jan 16 11:42:25 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_odbc.h,v 1.50 2003/01/16 16:27:31 kalowsky Exp $ */ +/* $Id: php_odbc.h,v 1.51 2003/01/16 16:42:25 kalowsky Exp $ */ #ifndef PHP_ODBC_H #define PHP_ODBC_H @@ -54,7 +54,7 @@ PHP_FUNCTION(odbc_do); PHP_FUNCTION(odbc_exec); PHP_FUNCTION(odbc_execute); -#if defined(HAVE_DBMAKER) || deifned(PHP_WIN32) +#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) PHP_FUNCTION(odbc_fetch_array); PHP_FUNCTION(odbc_fetch_object); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/rpc handler.h layer.h php_rpc.h rpc.c rpc.h /ext/rpc/com com.c com.h php_com.h /ext/rpc/skeleton skeleton.c skeleton.h
phanto Thu Jan 16 12:49:21 2003 EDT
Removed files:
/php4/ext/rpc layer.h
Modified files:
/php4/ext/rpc handler.h php_rpc.h rpc.c rpc.h
/php4/ext/rpc/com php_com.h com.c com.h
/php4/ext/rpc/skeleton skeleton.c skeleton.h
Log:
make layers loadable as self-sustaining php extension
which registeres itself in the rpc framework.
Index: php4/ext/rpc/handler.h
diff -u php4/ext/rpc/handler.h:1.13 php4/ext/rpc/handler.h:1.14
--- php4/ext/rpc/handler.h:1.13 Tue Dec 31 11:07:21 2002
+++ php4/ext/rpc/handler.h Thu Jan 16 12:49:20 2003
@@ -22,31 +22,22 @@
#include php.h
#include php_ini.h
-#define RPC_HANDLER(layer) {#layer, layer##_handler_init,
layer##_handler_shutdown,\
-
layer##_object_handlers, layer##_class_entry, \
-
layer##_function_entry, layer##_method_entry, \
-
layer##_ini_entry}
-
-#define RPC_DECLARE_HANDLER(layer) void layer##_handler_init(int
module_number TSRMLS_DC); \
- void
layer##_handler_shutdown(TSRMLS_D);\
-
rpc_object_handlers layer##_object_handlers;\
+#define RPC_REGISTER_LAYER(layer)
+rpc_register_layer(layer##_handler_entry TSRMLS_CC);
+#define RPC_DECLARE_HANDLER(layer) rpc_object_handlers
+layer##_object_handlers;\
zend_class_entry *layer##_class_entry; \
function_entry layer##_function_entry[];\
function_entry layer##_method_entry[]; \
-
zend_ini_entry layer##_ini_entry[];
+ static
+rpc_handler_entry layer##_handler_entry =\
+
+ {#layer, layer##_object_handlers, layer##_class_entry,\
+
+ layer##_function_entry, layer##_method_entry}
-#define RPC_INIT_FUNCTION(layer) void layer##_handler_init(int
module_number TSRMLS_DC)
-#define RPC_SHUTDOWN_FUNCTION(layer) void layer##_handler_shutdown(TSRMLS_D)
-
-#define RPC_REGISTER_HANDLERS_START(layer) zend_class_entry
*layer##_class_entry; \
+#define RPC_REGISTER_HANDLERS_BEGIN(layer) zend_class_entry
+*layer##_class_entry; \
rpc_object_handlers layer##_object_handlers = {
#define RPC_REGISTER_HANDLERS_END()};
-#define RPC_INI_START(layer) zend_ini_entry layer##_ini_entry[] = {
-#define RPC_INI_END() { 0, 0, NULL, 0, NULL, NULL,
NULL, NULL, NULL, 0, NULL, 0, 0, NULL } };
-
-#define RPC_FUNCTION_ENTRY_START(layer)function_entry
layer##_function_entry[] = { \
+#define RPC_FUNCTION_ENTRY(layer) layer##_function_entry
+#define RPC_FUNCTION_ENTRY_BEGIN(layer)function_entry
+layer##_function_entry[] = { \
ZEND_FALIAS(layer##_load, rpc_load, NULL) \
ZEND_FALIAS(layer##_call, rpc_call, NULL) \
ZEND_FALIAS(layer##_get, rpc_get, NULL) \
@@ -57,7 +48,7 @@
#define RPC_FUNCTION_ENTRY_END() {NULL, NULL, NULL}
\
};
-#define RPC_METHOD_ENTRY_START(layer) function_entry layer##_method_entry[] = {
+#define RPC_METHOD_ENTRY_BEGIN(layer) function_entry layer##_method_entry[] = {
#define
[PHP-CVS] cvs: php4(PHP_4) / configure.in /main php_version.h
sas Thu Jan 16 12:56:33 2003 EDT Modified files: (Branch: PHP_4) /php4 configure.in /php4/main php_version.h Log: Open up the PHP_4 branch which has been derived from the current PHP_4_3 branch, so we don't introduce any ZE2-related changes. This branch has the purpose of housing experimental patches in the context of PHP 4/ZE1. Patches which don't qualify as bug fixes should not be committed to the PHP_4_3 branch. Note: The code on this branch is unlikely to be ever released in the form of a standard PHP release. Commit new features to the HEAD branch! Patches for this branch should be the exception. Note: The version is 4.5.0, because 4.4.0 has been used for some time in HEAD before being switched to 5.0.0. I would have used something like 4.X.X, but letters are not really supported by the current system. Index: php4/configure.in diff -u php4/configure.in:1.396.2.23 php4/configure.in:1.396.2.23.2.1 --- php4/configure.in:1.396.2.23Thu Jan 9 11:38:28 2003 +++ php4/configure.in Thu Jan 16 12:56:31 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.23 2003/01/09 16:38:28 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.23.2.1 2003/01/16 17:56:31 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,9 +42,9 @@ AC_CONFIG_HEADER(main/php_config.h) MAJOR_VERSION=4 -MINOR_VERSION=3 -RELEASE_VERSION=1 -EXTRA_VERSION=-dev +MINOR_VERSION=5 +RELEASE_VERSION=0 +EXTRA_VERSION= VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context Index: php4/main/php_version.h diff -u php4/main/php_version.h:1.66.2.10 php4/main/php_version.h:1.66.2.10.2.1 --- php4/main/php_version.h:1.66.2.10 Fri Dec 27 17:11:40 2002 +++ php4/main/php_version.h Thu Jan 16 12:56:32 2003 @@ -1,7 +1,7 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 4 -#define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 1 +#define PHP_MINOR_VERSION 5 +#define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 4.3.1-dev +#define PHP_VERSION 4.5.0-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main config.w32.h
phanto Thu Jan 16 13:16:51 2003 EDT Modified files: /php4/main config.w32.h Log: prevent HEAD + ZE1 builds and add COM Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.63 php4/main/config.w32.h:1.64 --- php4/main/config.w32.h:1.63 Wed Jan 15 11:53:49 2003 +++ php4/main/config.w32.h Thu Jan 16 13:16:50 2003 @@ -2,9 +2,13 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.63 2003/01/15 16:53:49 sebastian Exp $ + $Id: config.w32.h,v 1.64 2003/01/16 18:16:50 phanto Exp $ */ +#ifndef ZEND_ENGINE_2 +#error HEAD does not work with ZendEngine1 anymore +#endif + /* Default PHP / PEAR directories */ #define CONFIGURATION_FILE_PATH php.ini #define PEAR_INSTALLDIR c:\\php4\\pear @@ -34,6 +38,9 @@ /* Enable / Disable RPC extension (default: enabled) */ #define HAVE_RPC 1 + +/* Enable / Disable COM extension (default: enabled) */ +#define HAVE_COM 1 /* Enable / Disable CTYPE extension (default: enabled) */ #define HAVE_CTYPE 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/rpc/skeleton php_skeleton.h skeleton.c skeleton.h
phanto Thu Jan 16 13:46:58 2003 EDT
Added files:
/php4/ext/rpc/skeleton php_skeleton.h
Modified files:
/php4/ext/rpc/skeleton skeleton.c skeleton.h
Log:
update skeleton
Index: php4/ext/rpc/skeleton/skeleton.c
diff -u php4/ext/rpc/skeleton/skeleton.c:1.3 php4/ext/rpc/skeleton/skeleton.c:1.4
--- php4/ext/rpc/skeleton/skeleton.c:1.3Thu Jan 16 12:49:21 2003
+++ php4/ext/rpc/skeleton/skeleton.cThu Jan 16 13:46:58 2003
@@ -56,40 +56,68 @@
skeleton_get, /* property get handler */
skeleton_set, /* property set handler */
skeleton_compare, /* compare handler, can be NULL */
-skeleton_has_property, /* reflection functions,
-skeleton_unset_property,* can be NULL
-skeleton_get_properties */
+skeleton_has_property, /* reflection functions */
+skeleton_unset_property, /* can be NULL */
+skeleton_get_properties
RPC_REGISTER_HANDLERS_END()
/* register ini settings */
-RPC_INI_START(skeleton)
+PHP_INI_BEGIN()
/* TODO: palce your ini entries here */
-RPC_INI_END()
+PHP_INI_END()
/* register userspace functions */
-RPC_FUNCTION_ENTRY_START(skeleton)
+RPC_FUNCTION_ENTRY_BEGIN(skeleton)
/* TODO: add your userspace functions here */
ZEND_FE(skeleton_function, NULL)
RPC_FUNCTION_ENTRY_END()
/* register class methods */
-RPC_METHOD_ENTRY_START(skeleton)
+RPC_METHOD_ENTRY_BEGIN(skeleton)
/* TODO: add your class methods here */
ZEND_FALIAS(method, skeleton_function, NULL)
RPC_METHOD_ENTRY_END()
-/* init function that is called before the class is registered
- * so you can do any tricky stuff in here
- */
-RPC_INIT_FUNCTION(skeleton)
+zend_module_entry skeleton_module_entry = {
+ ZE2_STANDARD_MODULE_HEADER,
+ skeleton,
+ RPC_FUNCTION_ENTRY(skeleton),
+ ZEND_MINIT(skeleton),
+ ZEND_MSHUTDOWN(skeleton),
+ NULL,
+ NULL,
+ ZEND_MINFO(skeleton),
+ 0.1a,
+ STANDARD_MODULE_PROPERTIES
+};
+
+ZEND_MINIT_FUNCTION(skeleton)
{
/* TODO: place your init stuff here */
+
+ RPC_REGISTER_LAYER(skeleton);
+ REGISTER_INI_ENTRIES();
+
+ return SUCCESS;
}
-RPC_SHUTDOWN_FUNCTION(skeleton)
+ZEND_MSHUTDOWN_FUNCTION(skeleton)
{
/* TODO: place your shutdown stuff here */
+
+ UNREGISTER_INI_ENTRIES();
+
+ return SUCCESS;
}
+
+ZEND_MINFO_FUNCTION(skeleton)
+{
+ DISPLAY_INI_ENTRIES();
+}
+
+#ifdef COMPILE_DL_COM
+ZEND_GET_MODULE(skeleton);
+#endif
/* rpc handler functions */
static int skeleton_hash(rpc_string name, rpc_string *hash, void *data, int num_args,
char *arg_types, int type)
Index: php4/ext/rpc/skeleton/skeleton.h
diff -u php4/ext/rpc/skeleton/skeleton.h:1.3 php4/ext/rpc/skeleton/skeleton.h:1.4
--- php4/ext/rpc/skeleton/skeleton.h:1.3Thu Jan 16 12:49:21 2003
+++ php4/ext/rpc/skeleton/skeleton.hThu Jan 16 13:46:58 2003
@@ -24,6 +24,10 @@
RPC_DECLARE_HANDLER(skeleton);
+ZEND_MINIT_FUNCTION(skeleton);
+ZEND_MSHUTDOWN_FUNCTION(skeleton);
+ZEND_MINFO_FUNCTION(skeleton);
+
/* TODO: define your functions here */
ZEND_FUNCTION(skeleton_function);
/**/
Index: php4/ext/rpc/skeleton/php_skeleton.h
+++ php4/ext/rpc/skeleton/php_skeleton.h
/*
+--+
| PHP Version 4|
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
| Author: Harald Radi [EMAIL PROTECTED] |
+--+
*/
#ifndef PHP_SKELETON_H
#define PHP_SKELETON_H
extern zend_module_entry skeleton_module_entry;
#define phpext_skeleton_ptr skeleton_module_entry
#endif /* PHP_SKELETON_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard image.c php_image.h
helly Thu Jan 16 14:45:27 2003 EDT
Modified files:
/php4/ext/standard image.c php_image.h
Log:
- corrected error in file detection for very small files
- JPEG 2000 support, mostly Adam Wright [EMAIL PROTECTED]
@Enhanced jpeg 2000 support for GetImageSize(). (marcus, Adam Wright)
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.82 php4/ext/standard/image.c:1.83
--- php4/ext/standard/image.c:1.82 Wed Jan 8 19:15:33 2003
+++ php4/ext/standard/image.c Thu Jan 16 14:45:26 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.82 2003/01/09 00:15:33 sniper Exp $ */
+/* $Id: image.c,v 1.83 2003/01/16 19:45:26 helly Exp $ */
#include php.h
#include stdio.h
@@ -46,10 +46,13 @@
PHPAPI const char php_sig_swc[3] = {'C', 'W', 'S'};
PHPAPI const char php_sig_jpg[3] = {(char) 0xff, (char) 0xd8, (char) 0xff};
PHPAPI const char php_sig_png[8] = {(char) 0x89, (char) 0x50, (char) 0x4e, (char)
0x47,
-(char) 0x0d, (char) 0x0a, (char) 0x1a, (char) 0x0a};
+(char) 0x0d, (char) 0x0a, (char) 0x1a, (char)
+0x0a};
PHPAPI const char php_sig_tif_ii[4] = {'I','I', (char)0x2A, (char)0x00};
PHPAPI const char php_sig_tif_mm[4] = {'M','M', (char)0x00, (char)0x2A};
-PHPAPI const char php_sig_jpc[3] = {(char)0xFF, (char)0x4F, (char)0xff};
+PHPAPI const char php_sig_jpc[3] = {(char)0xff, (char)0x4f, (char)0xff};
+PHPAPI const char php_sig_jp2[12] = {(char)0x00, (char)0x00, (char)0x00, (char)0x0c,
+ (char)0x6a, (char)0x50, (char)0x20, (char)0x20,
+ (char)0x0d, (char)0x0a, (char)0x87, (char)0x0a};
PHPAPI const char php_sig_iff[4] = {'F','O','R','M'};
/* REMEMBER TO ADD MIME-TYPE TO FUNCTION php_image_type_to_mime_type */
@@ -76,7 +79,7 @@
REGISTER_LONG_CONSTANT(IMAGETYPE_BMP, IMAGE_FILETYPE_BMP, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_TIFF_II, IMAGE_FILETYPE_TIFF_II, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_TIFF_MM, IMAGE_FILETYPE_TIFF_MM, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT(IMAGETYPE_JPC, IMAGE_FILETYPE_JPC, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IMAGETYPE_JPC, IMAGE_FILETYPE_JPC ,CONST_CS |
+CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_JP2, IMAGE_FILETYPE_JP2, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_JPX, IMAGE_FILETYPE_JPX, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_JB2, IMAGE_FILETYPE_JB2, CONST_CS |
CONST_PERSISTENT);
@@ -85,6 +88,7 @@
#endif
REGISTER_LONG_CONSTANT(IMAGETYPE_IFF, IMAGE_FILETYPE_IFF, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(IMAGETYPE_WBMP,IMAGE_FILETYPE_WBMP,CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(IMAGETYPE_JPEG2000,IMAGE_FILETYPE_JPC ,CONST_CS |
+CONST_PERSISTENT);/* keep alias */
return SUCCESS;
}
/* }}} */
@@ -534,12 +538,6 @@
}
/* }}} */
-/* {{{ jpeg2000 constants
- See ext/exif for more */
-#define JC_SOC 0x4F /* Start of codestream */
-#define JC_SIZ 0x51 /* Image and tile size */
-/* }}} */
-
/* {{{ php_read4
*/
static unsigned int php_read4(php_stream * stream TSRMLS_DC)
@@ -556,37 +554,147 @@
}
/* }}} */
-/* {{{ php_handle_tiff
- main loop to parse TIFF structure */
+/* {{{ JPEG 2000 Marker Codes */
+#define JPEG2000_MARKER_PREFIX 0xFF /* All marker codes start with this */
+#define JPEG2000_MARKER_SOC 0x4F /* Start of Codestream */
+#define JPEG2000_MARKER_SOT 0x90 /* Start of Tile part */
+#define JPEG2000_MARKER_SOD 0x93 /* Start of Data */
+#define JPEG2000_MARKER_EOC 0xD9 /* End of Codestream */
+#define JPEG2000_MARKER_SIZ 0x51 /* Image and tile size */
+#define JPEG2000_MARKER_COD 0x52 /* Coding style default */
+#define JPEG2000_MARKER_COC 0x53 /* Coding style component */
+#define JPEG2000_MARKER_RGN 0x5E /* Region of interest */
+#define JPEG2000_MARKER_QCD 0x5C /* Quantization default */
+#define JPEG2000_MARKER_QCC 0x5D /* Quantization component */
+#define JPEG2000_MARKER_POC 0x5F /* Progression order change */
+#define JPEG2000_MARKER_TLM 0x55 /* Tile-part lengths */
+#define JPEG2000_MARKER_PLM 0x57 /* Packet length, main header */
+#define JPEG2000_MARKER_PLT 0x58 /* Packet length, tile-part header */
+#define JPEG2000_MARKER_PPM 0x60 /* Packed packet headers, main header */
+#define JPEG2000_MARKER_PPT 0x61 /* Packed packet headers, tile part header */
+#define JPEG2000_MARKER_SOP 0x91 /* Start of packet */
+#define JPEG2000_MARKER_EPH 0x92 /* End of packet header */
+#define JPEG2000_MARKER_CRG 0x63 /* Component registration */
+#define JPEG2000_MARKER_COM 0x64 /* Comment */
+/* }}} */
+
+/* {{{ php_handle_jpc
+ Main loop to parse JPEG2000 raw codestream structure */
[PHP-CVS] cvs: php4 /ext/standard/tests/image getimagesize.phpt image_type_to_mime_type.phpt
helly Thu Jan 16 14:46:12 2003 EDT
Modified files:
/php4/ext/standard/tests/image getimagesize.phpt
image_type_to_mime_type.phpt
Log:
- JPEG 2000 support
Index: php4/ext/standard/tests/image/getimagesize.phpt
diff -u php4/ext/standard/tests/image/getimagesize.phpt:1.4
php4/ext/standard/tests/image/getimagesize.phpt:1.5
--- php4/ext/standard/tests/image/getimagesize.phpt:1.4 Mon Nov 18 11:51:02 2002
+++ php4/ext/standard/tests/image/getimagesize.phpt Thu Jan 16 14:46:11 2003
@@ -40,7 +40,7 @@
string(9) image/bmp
}
[test1pix.jpc]=
- array(6) {
+ array(7) {
[0]=
int(1)
[1]=
@@ -50,9 +50,11 @@
[3]=
string(20) width=1 height=1
[bits]=
+int(8)
+[channels]=
int(3)
[mime]=
-string(10) image/jpeg
+string(24) application/octet-stream
}
[test1pix.jpg]=
array(7) {
Index: php4/ext/standard/tests/image/image_type_to_mime_type.phpt
diff -u php4/ext/standard/tests/image/image_type_to_mime_type.phpt:1.3
php4/ext/standard/tests/image/image_type_to_mime_type.phpt:1.4
--- php4/ext/standard/tests/image/image_type_to_mime_type.phpt:1.3 Thu Nov 7
21:50:28 2002
+++ php4/ext/standard/tests/image/image_type_to_mime_type.phpt Thu Jan 16 14:46:12
+2003
@@ -29,7 +29,7 @@
[test1pix.bmp]=
string(9) image/bmp
[test1pix.jpc]=
- string(10) image/jpeg
+ string(24) application/octet-stream
[test1pix.jpg]=
string(10) image/jpeg
[test2pix.gif]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sterlingThu Jan 16 15:43:47 2003 EDT Modified files: /CVSROOTavail Log: give phanto adt access Index: CVSROOT/avail diff -u CVSROOT/avail:1.577 CVSROOT/avail:1.578 --- CVSROOT/avail:1.577 Sat Jan 11 16:59:46 2003 +++ CVSROOT/avail Thu Jan 16 15:43:46 2003 @@ -85,7 +85,7 @@ # Finally, there are various people with access to various bits and # pieces of other CVS modules. -avail|sterling,derick,imajes,sebastian|adt +avail|sterling,derick,imajes,phanto,sebastian|adt avail|hholzgra,stas|functable avail|alan_k|php-gtk/ext/gtkhtml,php-gtk/ext/scintilla avail|jmoore,alan_k|php-gtk/generator -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard filters.c
moriyoshi Thu Jan 16 15:59:08 2003 EDT
Modified files:
/php4/ext/standard filters.c
Log:
Finally fixed a qp encoder bug that line break characters that appear exactly
at the end of the chunk lost in the output.
# I bet no more problems will occur in quoted-printable encoder.
# But I recognised the counterpart is still buggy due to RFC2045-incompliance.
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.19 php4/ext/standard/filters.c:1.20
--- php4/ext/standard/filters.c:1.19Wed Jan 15 10:05:17 2003
+++ php4/ext/standard/filters.c Thu Jan 16 15:59:07 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: filters.c,v 1.19 2003/01/15 15:05:17 moriyoshi Exp $ */
+/* $Id: filters.c,v 1.20 2003/01/16 20:59:07 moriyoshi Exp $ */
#include php.h
#include php_globals.h
@@ -680,11 +680,11 @@
}
#define NEXT_CHAR(ps, icnt, lb_ptr, lb_cnt, lbchars) \
- ((lb_cnt) (lb_ptr) ? (lbchars)[(lb_cnt)] : *(ps))
+ ((lb_ptr) (lb_cnt) ? (lbchars)[(lb_ptr)] : *(ps))
#define CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt) \
- if ((lb_cnt) (lb_ptr)) { \
- (lb_cnt)++; \
+ if ((lb_ptr) (lb_cnt)) { \
+ (lb_ptr)++; \
} else { \
(lb_cnt) = (lb_ptr) = 0; \
--(icnt); \
@@ -703,7 +703,12 @@
int opts;
static char qp_digits[] = 0123456789ABCDEF;
- if (in_pp == NULL || in_left_p == NULL) {
+ line_ccnt = inst-line_ccnt;
+ opts = inst-opts;
+ lb_ptr = inst-lb_ptr;
+ lb_cnt = inst-lb_cnt;
+
+ if ((in_pp == NULL || in_left_p == NULL) (lb_ptr =lb_cnt)) {
return PHP_CONV_ERR_SUCCESS;
}
@@ -711,19 +716,13 @@
icnt = *in_left_p;
pd = (unsigned char *)(*out_pp);
ocnt = *out_left_p;
- line_ccnt = inst-line_ccnt;
- opts = inst-opts;
- lb_ptr = inst-lb_ptr;
- lb_cnt = inst-lb_cnt;
- while (icnt 0) {
+ for (;;) {
if (!(opts PHP_CONV_QPRINT_OPT_BINARY) inst-lbchars != NULL
inst-lbchars_len 0) {
/* look ahead for the line break chars to make a right decision
* how to consume incoming characters */
- if (*ps == inst-lbchars[lb_cnt]) {
- ps++;
- icnt--;
+ if (icnt 0 *ps == inst-lbchars[lb_cnt]) {
lb_cnt++;
if (lb_cnt = inst-lbchars_len) {
@@ -742,9 +741,14 @@
line_ccnt = inst-line_len;
lb_ptr = lb_cnt = 0;
}
+ ps++, icnt--;
continue;
}
}
+
+ if (lb_ptr = lb_cnt icnt = 0) {
+ break;
+ }
c = NEXT_CHAR(ps, icnt, lb_ptr, lb_cnt, inst-lbchars);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/pdf pdf.c
iliaa Thu Jan 16 16:18:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/pdf pdf.c
Log:
MFH
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.112.2.3 php4/ext/pdf/pdf.c:1.112.2.4
--- php4/ext/pdf/pdf.c:1.112.2.3Tue Dec 31 11:35:11 2002
+++ php4/ext/pdf/pdf.c Thu Jan 16 16:18:55 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: pdf.c,v 1.112.2.3 2002/12/31 16:35:11 sebastian Exp $ */
+/* $Id: pdf.c,v 1.112.2.4 2003/01/16 21:18:55 iliaa Exp $ */
/* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -331,7 +331,7 @@
#else
php_info_print_table_row(2, PDFlib GmbH Version, tmp );
#endif
- php_info_print_table_row(2, Revision, $Revision: 1.112.2.3 $ );
+ php_info_print_table_row(2, Revision, $Revision: 1.112.2.4 $ );
php_info_print_table_end();
}
@@ -1979,7 +1979,7 @@
} else {
#endif
if (im-pixels gdImageBoundsSafe(im, j, i)) {
- color = im-pixels[im-sy][im-sx];
+ color = im-pixels[i][j];
*ptr++ = im-red[color];
*ptr++ = im-green[color];
*ptr++ = im-blue[color];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pdf pdf.c
iliaa Thu Jan 16 16:18:49 2003 EDT
Modified files:
/php4/ext/pdf pdf.c
Log:
Fixed bug #21651 (crash in pdf_open_memory_image() when inserting a
non truecolor image).
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.115 php4/ext/pdf/pdf.c:1.116
--- php4/ext/pdf/pdf.c:1.115Tue Dec 31 11:07:14 2002
+++ php4/ext/pdf/pdf.c Thu Jan 16 16:18:48 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: pdf.c,v 1.115 2002/12/31 16:07:14 sebastian Exp $ */
+/* $Id: pdf.c,v 1.116 2003/01/16 21:18:48 iliaa Exp $ */
/* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -331,7 +331,7 @@
#else
php_info_print_table_row(2, PDFlib GmbH Version, tmp );
#endif
- php_info_print_table_row(2, Revision, $Revision: 1.115 $ );
+ php_info_print_table_row(2, Revision, $Revision: 1.116 $ );
php_info_print_table_end();
}
@@ -1979,7 +1979,7 @@
} else {
#endif
if (im-pixels gdImageBoundsSafe(im, j, i)) {
- color = im-pixels[im-sy][im-sx];
+ color = im-pixels[i][j];
*ptr++ = im-red[color];
*ptr++ = im-green[color];
*ptr++ = im-blue[color];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/bcmath/libbcmath/src config.h
phanto Thu Jan 16 16:52:06 2003 EDT Modified files: /php4/ext/bcmath/libbcmath/src config.h Log: unbreak the build Index: php4/ext/bcmath/libbcmath/src/config.h diff -u php4/ext/bcmath/libbcmath/src/config.h:1.3 php4/ext/bcmath/libbcmath/src/config.h:1.4 --- php4/ext/bcmath/libbcmath/src/config.h:1.3 Wed Sep 4 07:20:18 2002 +++ php4/ext/bcmath/libbcmath/src/config.h Thu Jan 16 16:52:06 2003 @@ -1,3 +1,7 @@ +#include string.h +#include zend.h +#include zend_alloc.h + #if PHP_WIN32 #include ../../../../main/config.w32.h #elif defined(NETWARE) @@ -5,7 +9,3 @@ #else #include php_config.h #endif - -#include string.h -#include zend.h -#include zend_alloc.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/bcmath/libbcmath/src config.h
phanto Thu Jan 16 17:08:00 2003 EDT Modified files: /php4/ext/bcmath/libbcmath/src config.h Log: revert previous commit Index: php4/ext/bcmath/libbcmath/src/config.h diff -u php4/ext/bcmath/libbcmath/src/config.h:1.4 php4/ext/bcmath/libbcmath/src/config.h:1.5 --- php4/ext/bcmath/libbcmath/src/config.h:1.4 Thu Jan 16 16:52:06 2003 +++ php4/ext/bcmath/libbcmath/src/config.h Thu Jan 16 17:08:00 2003 @@ -1,7 +1,3 @@ -#include string.h -#include zend.h -#include zend_alloc.h - #if PHP_WIN32 #include ../../../../main/config.w32.h #elif defined(NETWARE) @@ -9,3 +5,7 @@ #else #include php_config.h #endif + +#include string.h +#include zend.h +#include zend_alloc.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main internal_functions_win32.c
sebastian Fri Jan 17 01:15:26 2003 EDT
Modified files:
/php4/main internal_functions_win32.c
Log:
Move ZEND_ENGINE_2 check to where it is defined.
Index: php4/main/internal_functions_win32.c
diff -u php4/main/internal_functions_win32.c:1.70
php4/main/internal_functions_win32.c:1.71
--- php4/main/internal_functions_win32.c:1.70 Thu Jan 16 17:09:58 2003
+++ php4/main/internal_functions_win32.cFri Jan 17 01:15:24 2003
@@ -16,13 +16,9 @@
| Zeev Suraski [EMAIL PROTECTED]|
+--+
- $Id: internal_functions_win32.c,v 1.70 2003/01/16 22:09:58 phanto Exp $
+ $Id: internal_functions_win32.c,v 1.71 2003/01/17 06:15:24 sebastian Exp $
*/
-#ifndef ZEND_ENGINE_2
-#error HEAD does not work with ZendEngine1 anymore
-#endif
-
/* {{{ includes
*/
#include php.h
@@ -33,6 +29,10 @@
#include stdarg.h
#include stdlib.h
#include stdio.h
+
+#ifndef ZEND_ENGINE_2
+#error HEAD does not work with ZendEngine1 anymore
+#endif
#include ext/standard/dl.h
#include ext/standard/file.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
