mirror of
https://github.com/bdnugget/php-src.git
synced 2026-11-19 23:16:38 +00:00
Compare commits
27
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
67f7a9fe85 | ||
|
|
da252cabf0 | ||
|
|
856356afa2 | ||
|
|
0c226da31e | ||
|
|
e2b1d7c2a0 | ||
|
|
2611b98a91 | ||
|
|
5b9407dbd6 | ||
|
|
df6bb0f431 | ||
|
|
3deb77848a | ||
|
|
8a19f55900 | ||
|
|
b318045e53 | ||
|
|
d818b747aa | ||
|
|
4f06c73aae | ||
|
|
1a967de79e | ||
|
|
118ae69499 | ||
|
|
140720a22e | ||
|
|
833813478e | ||
|
|
750f87ccce | ||
|
|
86c5460229 | ||
|
|
8fcc3a3140 | ||
|
|
70376b4b7c | ||
|
|
4e845e50b0 | ||
|
|
2166451472 | ||
|
|
0cae755c9b | ||
|
|
d73efa9300 | ||
|
|
daf8ff05d5 | ||
|
|
ee759fdf89 |
No files matched your search
@@ -1,8 +1,13 @@
|
||||
PHP 4.0 NEWS
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
|
||||
?? ??? 200?, Version 4.0.5
|
||||
- New FastCGI server module. (Ben Mansell)
|
||||
30 Apr 2001, Version 4.0.5
|
||||
- IMPORTANT: removed /F modifier handling from preg_replace(). Instead
|
||||
one should use new preg_replace_callback() function. (Andrei)
|
||||
- Added new php.ini directive: arg_separator.input which is used to tell
|
||||
PHP which characters are considered as argument separators in URLs.
|
||||
Renamed php.ini directive: arg_separator -> arg_separator.output (Jani)
|
||||
- Added FastCGI SAPI module. (Ben Mansell)
|
||||
- Added array_reduce(), which allows iterative reduction of an array
|
||||
to a single value via a callback function. (Andrei)
|
||||
- The imageloadfont function of the gd extension should be not platform
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
How to install PHP with the BCMath arbitrary precision math library?
|
||||
--------------------------------------------------------------------
|
||||
|
||||
Due to license restrictions, the BC math library can no longer be distributed
|
||||
along with PHP. The BC math library is distributed under the restrictive
|
||||
GNU Public License, and PHP is no longer distributed under that license, but
|
||||
under a less restrictive license, the PHP License.
|
||||
|
||||
If you want to enable BC math support (recommended), all you have to do is
|
||||
simply download http://www.php.net/extra/number4.tar.gz, and untar it on the
|
||||
top level php4 directory.
|
||||
|
||||
A typical way of doing this would be (assuming that you have lynx):
|
||||
cd ~/php4
|
||||
lynx -dump -source http://www.php.net/extra/number4.tar.gz | gzip -d | tar xvf -
|
||||
|
||||
The PHP Group
|
||||
+23
-26
@@ -153,7 +153,7 @@ TSRM_API void tsrm_shutdown(void)
|
||||
#if defined(GNUPTH)
|
||||
pth_kill();
|
||||
#elif defined(PTHREADS)
|
||||
pthread_key_delete( tls_key );
|
||||
pthread_key_delete( tls_key );
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -225,8 +225,8 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
|
||||
(*thread_resources_ptr)->next = NULL;
|
||||
|
||||
#if defined(PTHREADS)
|
||||
/* Set thread local storage to this new thread resources structure */
|
||||
pthread_setspecific( tls_key, (void *)*thread_resources_ptr );
|
||||
/* Set thread local storage to this new thread resources structure */
|
||||
pthread_setspecific( tls_key, (void *)*thread_resources_ptr );
|
||||
#endif
|
||||
|
||||
if (tsrm_new_thread_begin_handler) {
|
||||
@@ -254,23 +254,23 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
|
||||
int hash_value;
|
||||
tsrm_tls_entry *thread_resources;
|
||||
|
||||
if( !th_id ) {
|
||||
if( !th_id ) {
|
||||
#if defined(PTHREADS)
|
||||
/* Fast path for looking up the resources for the current
|
||||
* thread. Its used by just about every call to
|
||||
* ts_resource_ex(). This avoids the need for a mutex lock
|
||||
* and our hashtable lookup.
|
||||
*/
|
||||
thread_resources = pthread_getspecific( tls_key );
|
||||
if( thread_resources ) {
|
||||
TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id );
|
||||
return ts_resource_read( thread_resources, id );
|
||||
}
|
||||
/* Fast path for looking up the resources for the current
|
||||
* thread. Its used by just about every call to
|
||||
* ts_resource_ex(). This avoids the need for a mutex lock
|
||||
* and our hashtable lookup.
|
||||
*/
|
||||
thread_resources = pthread_getspecific( tls_key );
|
||||
if( thread_resources ) {
|
||||
TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id );
|
||||
return ts_resource_read( thread_resources, id );
|
||||
}
|
||||
#endif
|
||||
thread_id = tsrm_thread_id();
|
||||
} else {
|
||||
thread_id = *th_id;
|
||||
}
|
||||
}
|
||||
|
||||
TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for thread %ld", id, (long) thread_id);
|
||||
tsrm_mutex_lock(tsmm_mutex);
|
||||
@@ -299,7 +299,7 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
|
||||
} while (thread_resources);
|
||||
}
|
||||
tsrm_mutex_unlock(tsmm_mutex);
|
||||
return ts_resource_read( thread_resources, id );
|
||||
return ts_resource_read( thread_resources, id );
|
||||
}
|
||||
|
||||
|
||||
@@ -316,7 +316,7 @@ void *ts_resource_read( tsrm_tls_entry *thread_resources, ts_rsrc_id id )
|
||||
TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Successfully fetched resource id %d for thread id %ld - %x", id, (long) thread_resources->thread_id, (long) resource);
|
||||
} else {
|
||||
TSRM_ERROR(TSRM_ERROR_LEVEL_ERROR, "Resource id %d is out of range (%d..%d)", id, TSRM_SHUFFLE_RSRC_ID(0), TSRM_SHUFFLE_RSRC_ID(thread_resources->count-1));
|
||||
abort();
|
||||
abort();
|
||||
}
|
||||
return resource;
|
||||
}
|
||||
@@ -326,7 +326,7 @@ void *ts_resource_read( tsrm_tls_entry *thread_resources, ts_rsrc_id id )
|
||||
void ts_free_thread(void)
|
||||
{
|
||||
tsrm_tls_entry *thread_resources;
|
||||
int i;
|
||||
int i;
|
||||
THREAD_T thread_id = tsrm_thread_id();
|
||||
int hash_value;
|
||||
tsrm_tls_entry *last=NULL;
|
||||
@@ -337,26 +337,23 @@ void ts_free_thread(void)
|
||||
|
||||
while (thread_resources) {
|
||||
if (thread_resources->thread_id == thread_id) {
|
||||
tsrm_mutex_unlock(tsmm_mutex);
|
||||
|
||||
for (i=0; i<thread_resources->count; i++) {
|
||||
if (resource_types_table[i].dtor) {
|
||||
resource_types_table[i].dtor(thread_resources->storage[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for (i=0; i<thread_resources->count; i++) {
|
||||
free(thread_resources->storage[i]);
|
||||
}
|
||||
tsrm_mutex_lock(tsmm_mutex);
|
||||
free(thread_resources->storage);
|
||||
if (last) {
|
||||
last->next = thread_resources->next;
|
||||
} else {
|
||||
tsrm_tls_table[hash_value]=NULL;
|
||||
tsrm_tls_table[hash_value] = thread_resources->next;
|
||||
}
|
||||
#if defined(PTHREADS)
|
||||
pthread_setspecific( tls_key, 0 );
|
||||
#endif
|
||||
pthread_setspecific(tls_key, 0);
|
||||
#endif
|
||||
free(thread_resources);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -869,9 +869,9 @@ static int copy_function_name(zend_function *func, int num_args, va_list args, z
|
||||
}
|
||||
|
||||
if (func->type == ZEND_INTERNAL_FUNCTION) {
|
||||
add_next_index_stringl(internal_ar, hash_key->arKey, hash_key->nKeyLength, 1);
|
||||
add_next_index_stringl(internal_ar, hash_key->arKey, hash_key->nKeyLength-1, 1);
|
||||
} else if (func->type == ZEND_USER_FUNCTION) {
|
||||
add_next_index_stringl(user_ar, hash_key->arKey, hash_key->nKeyLength, 1);
|
||||
add_next_index_stringl(user_ar, hash_key->arKey, hash_key->nKeyLength-1, 1);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
+7
-3
@@ -2141,9 +2141,13 @@ send_by_ref:
|
||||
|
||||
if (opline->extended_value) {
|
||||
array_ptr_ptr = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_R);
|
||||
SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr);
|
||||
array_ptr = *array_ptr_ptr;
|
||||
array_ptr->refcount++;
|
||||
if (array_ptr_ptr == NULL) {
|
||||
MAKE_STD_ZVAL(array_ptr);
|
||||
} else {
|
||||
SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr);
|
||||
array_ptr = *array_ptr_ptr;
|
||||
array_ptr->refcount++;
|
||||
}
|
||||
} else {
|
||||
array_ptr = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R);
|
||||
if (EG(free_op1)) { /* IS_TMP_VAR */
|
||||
|
||||
+2
-2
@@ -51,7 +51,7 @@ dnl ## All of these are normally in the extension directories.
|
||||
dnl ## Diversion 5 is the last one. Here we generate files and clean up.
|
||||
|
||||
dnl ## This is where the version number is changed from now on!
|
||||
AM_INIT_AUTOMAKE(php, 4.0.5RC6, nodefine)
|
||||
AM_INIT_AUTOMAKE(php, 4.0.5, nodefine)
|
||||
|
||||
PHP_VERSION=$VERSION
|
||||
echo "/* automatically generated by configure */" > php_version.h.new
|
||||
@@ -252,7 +252,7 @@ AC_CHECK_LIB(m, sin)
|
||||
|
||||
dnl Only include libbind if inet_aton is not found in
|
||||
dnl libresolv.
|
||||
AC_CHECK_LIB(resolv, inet_aton. [], [
|
||||
AC_CHECK_LIB(resolv, inet_aton, [], [
|
||||
AC_CHECK_LIB(bind, inet_aton, [], [
|
||||
AC_CHECK_LIB(bind, __inet_aton)
|
||||
])
|
||||
|
||||
+222
-110
@@ -50,27 +50,17 @@
|
||||
|
||||
#define _WIN32_DCOM
|
||||
|
||||
#ifdef CP_THREAD_ACP
|
||||
#define PHP_COM_CODEPAGE CP_THREAD_ACP
|
||||
#else
|
||||
#define PHP_COM_CODEPAGE CP_ACP
|
||||
#endif
|
||||
|
||||
#include <iostream.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "php.h"
|
||||
#include "php_ini.h"
|
||||
#include "com.h"
|
||||
|
||||
#include "conversion.h"
|
||||
#include "unknwn.h"
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
|
||||
zend_class_entry com_class_entry;
|
||||
|
||||
END_EXTERN_C()
|
||||
|
||||
PHP_FUNCTION(COM_load);
|
||||
PHP_FUNCTION(COM_invoke);
|
||||
PHP_FUNCTION(com_propget);
|
||||
@@ -101,27 +91,94 @@ static PHP_MINFO_FUNCTION(COM)
|
||||
|
||||
static int php_COM_load_typelib(char *typelib_name, int mode);
|
||||
|
||||
PHPAPI HRESULT php_COM_invoke(i_dispatch *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult)
|
||||
{
|
||||
if(obj->typelib) {
|
||||
return obj->i.dispatch->lpVtbl->Invoke(obj->i.dispatch, dispIdMember, &IID_NULL, LOCALE_SYSTEM_DEFAULT,
|
||||
wFlags, pDispParams, pVarResult, NULL, NULL);
|
||||
} else {
|
||||
return obj->i.typeinfo->lpVtbl->Invoke(obj->i.typeinfo, obj->i.dispatch, dispIdMember,
|
||||
wFlags, pDispParams, pVarResult, NULL, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_get_ids_of_names(i_dispatch *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId)
|
||||
{
|
||||
if(obj->typelib) {
|
||||
return obj->i.dispatch->lpVtbl->GetIDsOfNames(obj->i.dispatch, &IID_NULL, rgszNames, 1, LOCALE_SYSTEM_DEFAULT, rgDispId);
|
||||
} else {
|
||||
return obj->i.typeinfo->lpVtbl->GetIDsOfNames(obj->i.typeinfo, rgszNames, 1, rgDispId);
|
||||
}
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_release(i_dispatch *obj)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
hr = obj->i.dispatch->lpVtbl->Release(obj->i.dispatch);
|
||||
obj->i.dispatch = NULL;
|
||||
obj->i.typeinfo = NULL;
|
||||
obj->typelib = FALSE;
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_set(i_dispatch *obj, IDispatch FAR* pDisp, int cleanup)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
obj->i.dispatch = pDisp;
|
||||
obj->typelib = !FAILED(obj->i.dispatch->lpVtbl->GetTypeInfo(obj->i.dispatch, 0, LANG_NEUTRAL, &obj->i.typeinfo));
|
||||
|
||||
if(cleanup) {
|
||||
pDisp = NULL;
|
||||
} else {
|
||||
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
|
||||
}
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_clone(i_dispatch *obj, i_dispatch *clone, int cleanup)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
obj->typelib = clone->typelib;
|
||||
obj->i.dispatch = clone->i.dispatch;
|
||||
obj->i.typeinfo = clone->i.typeinfo;
|
||||
|
||||
if(cleanup) {
|
||||
obj->i.dispatch = NULL;
|
||||
obj->i.typeinfo = NULL;
|
||||
obj->typelib = FALSE;
|
||||
} else {
|
||||
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
|
||||
}
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
PHPAPI char *php_COM_error_message(HRESULT hr)
|
||||
{
|
||||
char *pMsgBuf;
|
||||
void *pMsgBuf;
|
||||
|
||||
if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
|
||||
hr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pMsgBuf, 0, NULL)) {
|
||||
char error_string[] = "No description available";
|
||||
|
||||
pMsgBuf = (char *) LocalAlloc(LMEM_FIXED, sizeof(error_string));
|
||||
pMsgBuf = LocalAlloc(LMEM_FIXED, sizeof(error_string));
|
||||
memcpy(pMsgBuf, error_string, sizeof(error_string));
|
||||
}
|
||||
|
||||
return pMsgBuf;
|
||||
}
|
||||
|
||||
static char *php_string_from_clsid(const CLSID clsid)
|
||||
static char *php_string_from_clsid(const CLSID *clsid)
|
||||
{
|
||||
LPOLESTR ole_clsid;
|
||||
char *clsid_str;
|
||||
|
||||
StringFromCLSID(&clsid, &ole_clsid);
|
||||
StringFromCLSID(clsid, &ole_clsid);
|
||||
clsid_str = php_OLECHAR_to_char(ole_clsid, NULL, 0, codepage);
|
||||
LocalFree(ole_clsid);
|
||||
|
||||
@@ -130,9 +187,9 @@ static char *php_string_from_clsid(const CLSID clsid)
|
||||
|
||||
static void php_idispatch_destructor(zend_rsrc_list_entry *rsrc)
|
||||
{
|
||||
IDispatch *i_dispatch = (IDispatch *)rsrc->ptr;
|
||||
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
i_dispatch *obj = (i_dispatch *)rsrc->ptr;
|
||||
php_COM_release(obj);
|
||||
efree(obj);
|
||||
}
|
||||
|
||||
static PHP_INI_MH(OnTypelibFileChange)
|
||||
@@ -199,12 +256,12 @@ static PHP_INI_MH(OnTypelibFileChange)
|
||||
|
||||
|
||||
PHP_INI_BEGIN()
|
||||
PHP_INI_ENTRY1_EX("allow_dcom", "0", PHP_INI_SYSTEM, NULL, NULL, php_ini_boolean_displayer_cb)
|
||||
PHP_INI_ENTRY1("typelib_file", NULL, PHP_INI_SYSTEM, OnTypelibFileChange, NULL)
|
||||
PHP_INI_ENTRY_EX("com.allow_dcom", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb)
|
||||
PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange)
|
||||
PHP_INI_END()
|
||||
|
||||
|
||||
/* {{{ proto int com_load(string module_name)
|
||||
/* {{{ proto int com_load(string module_name [, string remote_host [, int codepage]])
|
||||
Loads a COM module */
|
||||
PHP_FUNCTION(COM_load)
|
||||
{
|
||||
@@ -212,7 +269,7 @@ PHP_FUNCTION(COM_load)
|
||||
CLSID clsid;
|
||||
HRESULT hr;
|
||||
OLECHAR *ProgID;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
char *error_message;
|
||||
char *clsid_str;
|
||||
|
||||
@@ -222,7 +279,7 @@ PHP_FUNCTION(COM_load)
|
||||
codepage = CP_ACP;
|
||||
break;
|
||||
case 2:
|
||||
if (!INI_INT("allow_dcom")) {
|
||||
if (!INI_INT("com.allow_dcom")) {
|
||||
php_error(E_WARNING, "DCOM is disabled");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@@ -237,7 +294,7 @@ PHP_FUNCTION(COM_load)
|
||||
efree(server_name);
|
||||
server_name = NULL;
|
||||
} else {
|
||||
if (!INI_INT("allow_dcom")) {
|
||||
if (!INI_INT("com.allow_dcom")) {
|
||||
php_error(E_WARNING, "DCOM is disabled");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@@ -254,7 +311,7 @@ PHP_FUNCTION(COM_load)
|
||||
|
||||
convert_to_string(module_name);
|
||||
ProgID = php_char_to_OLECHAR(module_name->value.str.val, module_name->value.str.len, codepage);
|
||||
hr = CLSIDFromProgID(ProgID, &clsid);
|
||||
hr=CLSIDFromProgID(ProgID, &clsid);
|
||||
efree(ProgID);
|
||||
|
||||
/* obtain CLSID */
|
||||
@@ -265,9 +322,12 @@ PHP_FUNCTION(COM_load)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
|
||||
/* obtain IDispatch */
|
||||
if (!server_name) {
|
||||
hr = CoCreateInstance(&clsid, NULL, CLSCTX_SERVER, &IID_IDispatch, (LPVOID *) &i_dispatch);
|
||||
hr = CoCreateInstance(&clsid, NULL, CLSCTX_SERVER, &IID_IDispatch, (LPVOID *) &(obj->i.dispatch));
|
||||
php_COM_set(obj, obj->i.dispatch, TRUE);
|
||||
} else {
|
||||
COSERVERINFO server_info;
|
||||
MULTI_QI pResults;
|
||||
@@ -283,27 +343,28 @@ PHP_FUNCTION(COM_load)
|
||||
hr=CoCreateInstanceEx(&clsid, NULL, CLSCTX_SERVER, &server_info, 1, &pResults);
|
||||
if (SUCCEEDED(hr)) {
|
||||
hr = pResults.hr;
|
||||
i_dispatch = (IDispatch *) pResults.pItf;
|
||||
obj->i.dispatch = (IDispatch *) pResults.pItf;
|
||||
php_COM_set(obj, obj->i.dispatch, TRUE);
|
||||
}
|
||||
efree(server_info.pwszName);
|
||||
}
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
clsid_str = php_string_from_clsid(clsid);
|
||||
clsid_str = php_string_from_clsid(&clsid);
|
||||
php_error(E_WARNING,"Unable to obtain IDispatch interface for CLSID %s: %s",clsid_str,error_message);
|
||||
LocalFree(error_message);
|
||||
efree(clsid_str);
|
||||
efree(obj);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
||||
RETURN_LONG(zend_list_insert(i_dispatch,le_idispatch));
|
||||
RETURN_LONG(zend_list_insert(obj, le_idispatch));
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
||||
int do_COM_invoke(IDispatch *i_dispatch, pval *function_name, VARIANTARG *var_result, pval **arguments, int arg_count)
|
||||
int do_COM_invoke(i_dispatch *obj, pval *function_name, VARIANTARG *var_result, pval **arguments, int arg_count)
|
||||
{
|
||||
DISPID dispid;
|
||||
HRESULT hr;
|
||||
@@ -315,7 +376,7 @@ int do_COM_invoke(IDispatch *i_dispatch, pval *function_name, VARIANTARG *var_re
|
||||
|
||||
funcname = php_char_to_OLECHAR(function_name->value.str.val, function_name->value.str.len, codepage);
|
||||
|
||||
hr = i_dispatch->lpVtbl->GetIDsOfNames(i_dispatch, &IID_NULL, &funcname, 1, LOCALE_SYSTEM_DEFAULT, &dispid);
|
||||
hr = php_COM_get_ids_of_names(obj, &funcname, &dispid);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -337,9 +398,7 @@ int do_COM_invoke(IDispatch *i_dispatch, pval *function_name, VARIANTARG *var_re
|
||||
dispparams.cArgs = arg_count;
|
||||
dispparams.cNamedArgs = 0;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL,
|
||||
LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD|DISPATCH_PROPERTYGET,
|
||||
&dispparams, var_result, NULL, NULL);
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, var_result);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -362,7 +421,7 @@ PHP_FUNCTION(COM_invoke)
|
||||
{
|
||||
pval **arguments;
|
||||
pval *object, *function_name;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
int type;
|
||||
int arg_count = ZEND_NUM_ARGS();
|
||||
VARIANTARG var_result;
|
||||
@@ -378,10 +437,10 @@ PHP_FUNCTION(COM_invoke)
|
||||
object = arguments[0];
|
||||
function_name = arguments[1];
|
||||
|
||||
/* obtain i_dispatch interface */
|
||||
/* obtain IDispatch interface */
|
||||
convert_to_long(object);
|
||||
i_dispatch = (IDispatch *)zend_list_find(object->value.lval, &type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find(object->value.lval, &type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
php_error(E_WARNING,"%d is not a COM object handler", function_name->value.str.val);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@@ -389,7 +448,7 @@ PHP_FUNCTION(COM_invoke)
|
||||
/* obtain property/method handler */
|
||||
convert_to_string(function_name);
|
||||
|
||||
if (do_COM_invoke(i_dispatch, function_name, &var_result, arguments+2, arg_count-2)==FAILURE) {
|
||||
if (do_COM_invoke(obj, function_name, &var_result, arguments+2, arg_count-2)==FAILURE) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
efree(arguments);
|
||||
@@ -403,16 +462,21 @@ static int do_COM_offget(VARIANTARG *var_result, VARIANTARG *array, pval *arg_pr
|
||||
switch (array->vt) {
|
||||
case VT_DISPATCH: { /* a Collection, possibly */
|
||||
pval function_name;
|
||||
IDispatch *i_dispatch = array->pdispVal;
|
||||
i_dispatch *obj;
|
||||
int retval;
|
||||
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
php_COM_set(obj, array->pdispVal, TRUE);
|
||||
|
||||
function_name.value.str.val = "Item";
|
||||
function_name.value.str.len = 4;
|
||||
function_name.type = IS_STRING;
|
||||
retval = do_COM_invoke(i_dispatch, &function_name, var_result, &arg_property, 1);
|
||||
retval = do_COM_invoke(obj, &function_name, var_result, &arg_property, 1);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
efree(obj);
|
||||
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
@@ -420,7 +484,7 @@ static int do_COM_offget(VARIANTARG *var_result, VARIANTARG *array, pval *arg_pr
|
||||
}
|
||||
|
||||
|
||||
static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *arg_property, int cleanup)
|
||||
static int do_COM_propget(VARIANTARG *var_result, i_dispatch *obj, pval *arg_property, int cleanup)
|
||||
{
|
||||
DISPID dispid;
|
||||
HRESULT hr;
|
||||
@@ -432,7 +496,7 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
/* obtain property handler */
|
||||
propname = php_char_to_OLECHAR(arg_property->value.str.val, arg_property->value.str.len, codepage);
|
||||
|
||||
hr = i_dispatch->lpVtbl->GetIDsOfNames(i_dispatch, &IID_NULL, &propname, 1, LOCALE_SYSTEM_DEFAULT, &dispid);
|
||||
hr = php_COM_get_ids_of_names(obj, &propname, &dispid);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -440,7 +504,7 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
LocalFree(error_message);
|
||||
efree(propname);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
return FAILURE;
|
||||
}
|
||||
@@ -448,7 +512,7 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
dispparams.cArgs = 0;
|
||||
dispparams.cNamedArgs = 0;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispparams, var_result, NULL, 0);
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYGET, &dispparams, var_result);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -456,35 +520,37 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
LocalFree(error_message);
|
||||
efree(propname);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
efree(propname);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
static void do_COM_propput(pval *return_value, IDispatch *i_dispatch, pval *arg_property, pval *value)
|
||||
static void do_COM_propput(pval *return_value, i_dispatch *obj, pval *arg_property, pval *value)
|
||||
{
|
||||
DISPID dispid;
|
||||
HRESULT hr;
|
||||
OLECHAR *propname;
|
||||
char *error_message;
|
||||
VARIANTARG var_result;
|
||||
VARIANT *var_result;
|
||||
DISPPARAMS dispparams;
|
||||
VARIANTARG new_value;
|
||||
DISPID mydispid = DISPID_PROPERTYPUT;
|
||||
|
||||
|
||||
var_result = emalloc(sizeof(VARIANT));
|
||||
|
||||
/* obtain property handler */
|
||||
propname = php_char_to_OLECHAR(arg_property->value.str.val, arg_property->value.str.len, codepage);
|
||||
|
||||
hr = i_dispatch->lpVtbl->GetIDsOfNames(i_dispatch, &IID_NULL, &propname, 1, LOCALE_SYSTEM_DEFAULT, &dispid);
|
||||
hr = php_COM_get_ids_of_names(obj, &propname, &dispid);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -494,16 +560,14 @@ static void do_COM_propput(pval *return_value, IDispatch *i_dispatch, pval *arg_
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
||||
php_pval_to_variant(value, &new_value, codepage);
|
||||
dispparams.rgvarg = &new_value;
|
||||
dispparams.rgdispidNamedArgs = &mydispid;
|
||||
dispparams.cArgs = 1;
|
||||
dispparams.cNamedArgs = 1;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL,
|
||||
LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT,
|
||||
&dispparams, NULL, NULL, 0);
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYPUT, &dispparams, NULL);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
php_error(E_WARNING,"PropPut() failed: %s\n", error_message);
|
||||
@@ -515,18 +579,16 @@ static void do_COM_propput(pval *return_value, IDispatch *i_dispatch, pval *arg_
|
||||
dispparams.cArgs = 0;
|
||||
dispparams.cNamedArgs = 0;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL,
|
||||
LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET,
|
||||
&dispparams, &var_result, NULL, 0);
|
||||
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYGET, &dispparams, var_result);
|
||||
|
||||
if (SUCCEEDED(hr)) {
|
||||
php_variant_to_pval(&var_result, return_value, 0, codepage);
|
||||
php_variant_to_pval(var_result, return_value, 0, codepage);
|
||||
} else {
|
||||
*return_value = *value;
|
||||
zval_copy_ctor(return_value);
|
||||
}
|
||||
|
||||
efree(var_result);
|
||||
efree(propname);
|
||||
}
|
||||
|
||||
@@ -537,23 +599,22 @@ PHP_FUNCTION(com_propget)
|
||||
{
|
||||
pval *arg_idispatch, *arg_property;
|
||||
int type;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
VARIANTARG var_result;
|
||||
|
||||
if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &arg_idispatch, &arg_property)==FAILURE) {
|
||||
WRONG_PARAM_COUNT;
|
||||
}
|
||||
|
||||
/* obtain i_dispatch interface */
|
||||
/* obtain IDispatch interface */
|
||||
convert_to_long(arg_idispatch);
|
||||
/* obtain i_dispatch interface */
|
||||
i_dispatch = (IDispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
php_error(E_WARNING,"%d is not a COM object handler", arg_idispatch->value.lval);
|
||||
}
|
||||
convert_to_string(arg_property);
|
||||
|
||||
if (do_COM_propget(&var_result, i_dispatch, arg_property, 0)==FAILURE) {
|
||||
if (do_COM_propget(&var_result, obj, arg_property, 0)==FAILURE) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
php_variant_to_pval(&var_result, return_value, 0, codepage);
|
||||
@@ -567,7 +628,7 @@ PHP_FUNCTION(com_propput)
|
||||
{
|
||||
pval *arg_idispatch, *arg_property, *arg_value;
|
||||
int type;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
|
||||
if (ZEND_NUM_ARGS()!=3 || getParameters(ht, 3, &arg_idispatch, &arg_property, &arg_value)==FAILURE) {
|
||||
WRONG_PARAM_COUNT;
|
||||
@@ -576,62 +637,72 @@ PHP_FUNCTION(com_propput)
|
||||
/* obtain i_dispatch interface */
|
||||
convert_to_long(arg_idispatch);
|
||||
/* obtain i_dispatch interface */
|
||||
i_dispatch = (IDispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
php_error(E_WARNING,"%d is not a COM object handler", arg_idispatch->value.lval);
|
||||
}
|
||||
convert_to_string(arg_property);
|
||||
|
||||
do_COM_propput(return_value, i_dispatch, arg_property, arg_value);
|
||||
do_COM_propput(return_value, obj, arg_property, arg_value);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
||||
VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_reference)
|
||||
VARIANT *_php_COM_get_property_handler(zend_property_reference *property_reference)
|
||||
{
|
||||
zend_overloaded_element *overloaded_property;
|
||||
zend_llist_element *element;
|
||||
pval **idispatch_handle;
|
||||
pval *object = property_reference->object;
|
||||
IDispatch *i_dispatch;
|
||||
int type;
|
||||
VARIANTARG var_result;
|
||||
VARIANT *var_result;
|
||||
i_dispatch *obj, *obj_prop;
|
||||
|
||||
|
||||
/* fetch the IDispatch interface */
|
||||
zend_hash_index_find(object->value.obj.properties, 0, (void **) &idispatch_handle);
|
||||
i_dispatch = (IDispatch *)zend_list_find((*idispatch_handle)->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
return var_result;
|
||||
obj = (i_dispatch *) zend_list_find((*idispatch_handle)->value.lval, &type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
var_result.vt = VT_DISPATCH;
|
||||
var_result.pdispVal = i_dispatch;
|
||||
obj_prop = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
php_COM_clone(obj_prop, obj, FALSE);
|
||||
|
||||
var_result = (VARIANT *) emalloc(sizeof(VARIANT));
|
||||
var_result->vt = VT_DISPATCH;
|
||||
var_result->pdispVal = obj_prop->i.dispatch;
|
||||
|
||||
for (element=property_reference->elements_list->head; element; element=element->next) {
|
||||
overloaded_property = (zend_overloaded_element *) element->data;
|
||||
switch (overloaded_property->type) {
|
||||
case OE_IS_ARRAY:
|
||||
if (do_COM_offget(&var_result, &var_result, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
if (do_COM_offget(var_result, var_result, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result->vt = VT_EMPTY;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
}
|
||||
/*printf("Array offset: ");*/
|
||||
break;
|
||||
|
||||
case OE_IS_OBJECT:
|
||||
if (var_result.vt != VT_DISPATCH) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
if (var_result->vt != VT_DISPATCH) {
|
||||
var_result->vt = VT_EMPTY;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
} else {
|
||||
if (do_COM_propget(&var_result, var_result.pdispVal, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
php_COM_set(obj_prop, var_result->pdispVal, TRUE);
|
||||
if (do_COM_propget(var_result, obj_prop, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result->vt = VT_EMPTY;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
}
|
||||
/*printf("Object property: ");*/
|
||||
|
||||
}
|
||||
break;
|
||||
|
||||
case OE_IS_METHOD:
|
||||
var_result->pdispVal = obj_prop->i.dispatch;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
break;
|
||||
}
|
||||
@@ -647,15 +718,17 @@ VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_refer
|
||||
*/
|
||||
pval_destructor(&overloaded_property->element);
|
||||
}
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
}
|
||||
|
||||
PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_reference)
|
||||
{
|
||||
pval result;
|
||||
VARIANTARG var_result = _php_COM_get_property_handler(property_reference);
|
||||
VARIANT *var_result = _php_COM_get_property_handler(property_reference);
|
||||
|
||||
php_variant_to_pval(&var_result, &result, 0, codepage);
|
||||
php_variant_to_pval(var_result, &result, 0, codepage);
|
||||
efree(var_result);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -667,19 +740,19 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
|
||||
zend_llist_element *element;
|
||||
pval **idispatch_handle;
|
||||
pval *object = property_reference->object;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
int type;
|
||||
VARIANTARG var_result;
|
||||
|
||||
|
||||
/* fetch the IDispatch interface */
|
||||
zend_hash_index_find(object->value.obj.properties, 0, (void **) &idispatch_handle);
|
||||
i_dispatch = (IDispatch *)zend_list_find((*idispatch_handle)->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find((*idispatch_handle)->value.lval,&type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
return FAILURE;
|
||||
}
|
||||
var_result.vt = VT_DISPATCH;
|
||||
var_result.pdispVal = i_dispatch;
|
||||
var_result.pdispVal = obj->i.dispatch;
|
||||
|
||||
for (element=property_reference->elements_list->head; element && element!=property_reference->elements_list->tail; element=element->next) {
|
||||
overloaded_property = (zend_overloaded_element *) element->data;
|
||||
@@ -691,7 +764,8 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
|
||||
if (var_result.vt != VT_DISPATCH) {
|
||||
return FAILURE;
|
||||
} else {
|
||||
do_COM_propget(&var_result, i_dispatch, &overloaded_property->element, element!=property_reference->elements_list->head);
|
||||
// ??????
|
||||
do_COM_propget(&var_result, obj, &overloaded_property->element, element!=property_reference->elements_list->head);
|
||||
/*printf("Object property: ");*/
|
||||
}
|
||||
break;
|
||||
@@ -715,9 +789,15 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
|
||||
if (var_result.vt != VT_DISPATCH) {
|
||||
return FAILURE;
|
||||
}
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
obj->typelib = FALSE;
|
||||
obj->i.dispatch = var_result.pdispVal;
|
||||
|
||||
overloaded_property = (zend_overloaded_element *) element->data;
|
||||
do_COM_propput(&result, var_result.pdispVal, &overloaded_property->element, value);
|
||||
do_COM_propput(&result, obj, &overloaded_property->element, value);
|
||||
pval_destructor(&overloaded_property->element);
|
||||
efree(obj);
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
@@ -745,24 +825,26 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
|
||||
zend_hash_index_update(object->value.obj.properties, 0, &object_handle, sizeof(pval *), NULL);
|
||||
pval_destructor(&function_name->element);
|
||||
} else {
|
||||
VARIANTARG object_handle = _php_COM_get_property_handler(property_reference);
|
||||
i_dispatch *obj;
|
||||
pval **arguments;
|
||||
int arg_count = ZEND_NUM_ARGS();
|
||||
VARIANTARG var_result;
|
||||
|
||||
var_result.vt = VT_EMPTY;
|
||||
|
||||
if (object_handle.vt != VT_DISPATCH) {
|
||||
/* that shouldn't happen */
|
||||
return;
|
||||
}
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
php_COM_set(obj, _php_COM_get_property_handler(property_reference)->pdispVal, TRUE);
|
||||
|
||||
arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
|
||||
getParametersArray(ht, arg_count, arguments);
|
||||
|
||||
if (do_COM_invoke((IDispatch *) object_handle.pdispVal, &function_name->element, &var_result, arguments, arg_count)==FAILURE) {
|
||||
if (do_COM_invoke(obj , &function_name->element, &var_result, arguments, arg_count)==FAILURE) {
|
||||
RETVAL_FALSE;
|
||||
}
|
||||
|
||||
pval_destructor(&function_name->element);
|
||||
php_COM_release(obj);
|
||||
efree(obj);
|
||||
efree(arguments);
|
||||
php_variant_to_pval(&var_result, return_value, 0, codepage);
|
||||
}
|
||||
@@ -788,18 +870,52 @@ static int php_COM_load_typelib(char *typelib_name, int mode)
|
||||
ITypeLib *TypeLib;
|
||||
ITypeComp *TypeComp;
|
||||
OLECHAR *p;
|
||||
CLSID clsid;
|
||||
char *strtok_buf, *major, *minor;
|
||||
int i;
|
||||
int interfaces;
|
||||
ELS_FETCH();
|
||||
|
||||
|
||||
typelib_name = php_strtok_r(typelib_name, ",", &strtok_buf);
|
||||
major = php_strtok_r(NULL, ",", &strtok_buf);
|
||||
minor = php_strtok_r(NULL, ",", &strtok_buf);
|
||||
|
||||
p = php_char_to_OLECHAR(typelib_name, strlen(typelib_name), codepage);
|
||||
|
||||
if (FAILED(LoadTypeLib(p, &TypeLib))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
if (!FAILED(CLSIDFromString(p, &clsid))) {
|
||||
HRESULT hr;
|
||||
|
||||
if (major && minor) {
|
||||
hr = LoadRegTypeLib((REFGUID) &clsid, 1, 0, LANG_NEUTRAL, &TypeLib);
|
||||
}
|
||||
|
||||
if (!major || !minor || FAILED(hr)) {
|
||||
IDispatch *i_dispatch;
|
||||
ITypeInfo *TypeInfo;
|
||||
int idx;
|
||||
|
||||
if (FAILED(CoCreateInstance(&clsid, NULL, CLSCTX_SERVER, &IID_IDispatch, (LPVOID *) &i_dispatch))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
if (FAILED(i_dispatch->lpVtbl->GetTypeInfo(i_dispatch, 0, LANG_NEUTRAL, &TypeInfo))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
if (FAILED(TypeInfo->lpVtbl->GetContainingTypeLib(TypeInfo, &TypeLib, &idx))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (FAILED(LoadTypeLib(p, &TypeLib))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
interfaces = TypeLib->lpVtbl->GetTypeInfoCount(TypeLib);
|
||||
interfaces = TypeLib->lpVtbl->GetTypeInfoCount(TypeLib);
|
||||
|
||||
TypeLib->lpVtbl->GetTypeComp(TypeLib, &TypeComp);
|
||||
for (i=0; i<interfaces; i++) {
|
||||
@@ -865,7 +981,6 @@ void php_register_COM_class()
|
||||
zend_register_internal_class(&com_class_entry);
|
||||
}
|
||||
|
||||
|
||||
PHP_MINIT_FUNCTION(COM)
|
||||
{
|
||||
CoInitialize(NULL);
|
||||
@@ -883,7 +998,6 @@ PHP_MSHUTDOWN_FUNCTION(COM)
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
// exports for external object creation
|
||||
|
||||
zend_module_entry COM_module_entry = {
|
||||
@@ -894,6 +1008,4 @@ PHPAPI int php_COM_get_le_idispatch() {
|
||||
return le_idispatch;
|
||||
}
|
||||
|
||||
END_EXTERN_C()
|
||||
|
||||
#endif
|
||||
+30
-30
@@ -69,38 +69,38 @@ PHP_MINIT_FUNCTION(VARIANT)
|
||||
le_variant = zend_register_list_destructors_ex(php_variant_destructor, NULL, "VARIANT", module_number);
|
||||
|
||||
/* variant datatypes */
|
||||
REGISTER_LONG_CONSTANT("VT_NULL", VT_NULL, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_EMPTY", VT_EMPTY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UI1", VT_UI1, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_I2", VT_I2, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_I4", VT_I4, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_R4", VT_R4, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_R8", VT_R8, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_BOOL", VT_BOOL, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_ERROR", VT_ERROR, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_CY", VT_CY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_DATE", VT_CY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_BSTR", VT_BSTR, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_DECIMAL", VT_DECIMAL, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UNKNOWN", VT_UNKNOWN, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_DISPATCH", VT_DISPATCH, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_VARIANT", VT_VARIANT, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_I1", VT_I1, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UI2", VT_UI2, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UI4", VT_UI4, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_INT", VT_INT, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UINT", VT_UINT, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_ARRAY", VT_ARRAY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_BYREF", VT_BYREF, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_NULL", VT_NULL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_EMPTY", VT_EMPTY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UI1", VT_UI1, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_I2", VT_I2, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_I4", VT_I4, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_R4", VT_R4, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_R8", VT_R8, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_BOOL", VT_BOOL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_ERROR", VT_ERROR, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_CY", VT_CY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_DATE", VT_CY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_BSTR", VT_BSTR, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_DECIMAL", VT_DECIMAL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UNKNOWN", VT_UNKNOWN, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_DISPATCH", VT_DISPATCH, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_VARIANT", VT_VARIANT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_I1", VT_I1, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UI2", VT_UI2, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UI4", VT_UI4, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_INT", VT_INT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UINT", VT_UINT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_ARRAY", VT_ARRAY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_BYREF", VT_BYREF, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
/* codepages */
|
||||
REGISTER_LONG_CONSTANT("CP_ACP", CP_ACP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_MACCP", CP_MACCP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_OEMCP", CP_OEMCP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_SYMBOL", CP_SYMBOL, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_THREAD_ACP", CP_THREAD_ACP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF7", CP_UTF7, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF8", CP_UTF8, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_ACP", CP_ACP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_MACCP", CP_MACCP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_OEMCP", CP_OEMCP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_SYMBOL", CP_SYMBOL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_THREAD_ACP", CP_THREAD_ACP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF7", CP_UTF7, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF8", CP_UTF8, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
php_register_VARIANT_class();
|
||||
return SUCCESS;
|
||||
|
||||
+1
-7
@@ -3,7 +3,7 @@
|
||||
|
||||
#if PHP_WIN32
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
#include "com.h"
|
||||
|
||||
extern PHP_MINIT_FUNCTION(COM);
|
||||
extern PHP_MSHUTDOWN_FUNCTION(COM);
|
||||
@@ -13,17 +13,11 @@ extern int php_COM_get_le_idispatch();
|
||||
extern zend_module_entry COM_module_entry;
|
||||
extern zend_class_entry com_class_entry;
|
||||
|
||||
END_EXTERN_C()
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
extern pval php_COM_get_property_handler(zend_property_reference *property_reference);
|
||||
extern int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
|
||||
extern char *php_COM_error_message(HRESULT hr);
|
||||
extern void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
|
||||
|
||||
#endif
|
||||
|
||||
#define COM_module_ptr &COM_module_entry
|
||||
|
||||
#else
|
||||
|
||||
+9
-3
@@ -2748,12 +2748,18 @@ PHP_FUNCTION(imap_sort)
|
||||
mypgm->next = NIL;
|
||||
|
||||
slst = mail_sort(imap_le_struct->imap_stream, NIL, spg, mypgm, myargc >= 4 ? Z_LVAL_PP(flags) : NIL);
|
||||
if (spg) {
|
||||
mail_free_searchpgm(&spg);
|
||||
}
|
||||
|
||||
|
||||
array_init(return_value);
|
||||
for (sl = slst; *sl; sl++) {
|
||||
add_next_index_long(return_value, *sl);
|
||||
if (slst != NIL && slst != 0) {
|
||||
for (sl = slst; *sl; sl++) {
|
||||
add_next_index_long(return_value, *sl);
|
||||
}
|
||||
fs_give ((void **) &slst);
|
||||
}
|
||||
fs_give ((void **) &slst);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
||||
+38
-34
@@ -339,36 +339,37 @@ static PHP_MSHUTDOWN_FUNCTION(mcrypt)
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
#include "ext/standard/php_smart_str.h"
|
||||
|
||||
PHP_MINFO_FUNCTION(mcrypt)
|
||||
{
|
||||
#if HAVE_LIBMCRYPT24
|
||||
char **modules;
|
||||
int i, count;
|
||||
char *tmp, *tmp2;
|
||||
smart_str tmp1 = {0};
|
||||
smart_str tmp2 = {0};
|
||||
MCLS_FETCH();
|
||||
|
||||
tmp = emalloc (2048);
|
||||
memset (tmp, 0, sizeof(tmp));
|
||||
modules = mcrypt_list_algorithms (MCG(algorithms_dir), &count);
|
||||
if (count == 0) {
|
||||
strcpy (tmp, "none");
|
||||
smart_str_appends (&tmp1, "none");
|
||||
}
|
||||
for (i = 0; i < count; i++) {
|
||||
strcat (tmp, modules[i]);
|
||||
strcat (tmp, " ");
|
||||
smart_str_appends (&tmp1, modules[i]);
|
||||
smart_str_appendc (&tmp1, ' ');
|
||||
}
|
||||
smart_str_0 (&tmp1);
|
||||
mcrypt_free_p (modules, count);
|
||||
|
||||
tmp2 = emalloc (2048);
|
||||
memset (tmp2, 0, sizeof(tmp2));
|
||||
modules = mcrypt_list_modes (MCG(modes_dir), &count);
|
||||
if (count == 0) {
|
||||
strcpy (tmp2, "none");
|
||||
smart_str_appends (&tmp2, "none");
|
||||
}
|
||||
for (i = 0; i < count; i++) {
|
||||
strcat (tmp2, modules[i]);
|
||||
strcat (tmp2, " ");
|
||||
smart_str_appends (&tmp2, modules[i]);
|
||||
smart_str_appendc (&tmp2, ' ');
|
||||
}
|
||||
smart_str_0 (&tmp2);
|
||||
mcrypt_free_p (modules, count);
|
||||
#endif
|
||||
|
||||
@@ -379,10 +380,10 @@ PHP_MINFO_FUNCTION(mcrypt)
|
||||
#endif
|
||||
#if HAVE_LIBMCRYPT24
|
||||
php_info_print_table_row(2, "version", "2.4.x");
|
||||
php_info_print_table_row(2, "Supported ciphers", tmp);
|
||||
php_info_print_table_row(2, "Supported modes", tmp2);
|
||||
efree (tmp2);
|
||||
efree (tmp);
|
||||
php_info_print_table_row(2, "Supported ciphers", tmp1.c);
|
||||
php_info_print_table_row(2, "Supported modes", tmp2.c);
|
||||
smart_str_free (&tmp1);
|
||||
smart_str_free (&tmp2);
|
||||
#endif
|
||||
php_info_print_table_end();
|
||||
|
||||
@@ -436,9 +437,9 @@ PHP_FUNCTION(mcrypt_generic_init)
|
||||
{
|
||||
zval **key, **iv;
|
||||
zval **mcryptind;
|
||||
char *key_s, *iv_s;
|
||||
unsigned char *key_s, *iv_s;
|
||||
char dummy[256];
|
||||
int key_size, iv_size;
|
||||
int max_key_size, iv_size;
|
||||
MCRYPT td;
|
||||
int argc;
|
||||
MCLS_FETCH();
|
||||
@@ -451,29 +452,30 @@ PHP_FUNCTION(mcrypt_generic_init)
|
||||
convert_to_string_ex (key);
|
||||
convert_to_string_ex (iv);
|
||||
|
||||
key_size = mcrypt_enc_get_key_size (td);
|
||||
key_s = emalloc (key_size + 1);
|
||||
memset (key_s, 0, key_size + 1);
|
||||
|
||||
max_key_size = mcrypt_enc_get_key_size (td);
|
||||
iv_size = mcrypt_enc_get_iv_size (td);
|
||||
|
||||
key_s = emalloc (Z_STRLEN_PP(key));
|
||||
memset (key_s, 0, Z_STRLEN_PP(key));
|
||||
|
||||
iv_s = emalloc (iv_size + 1);
|
||||
memset (iv_s, 0, iv_size + 1);
|
||||
|
||||
if (Z_STRLEN_PP(key) != key_size) {
|
||||
sprintf (dummy, "key size incorrect; supplied length: %d, needed: %d",
|
||||
Z_STRLEN_PP(key), key_size);
|
||||
if (Z_STRLEN_PP(key) > max_key_size) {
|
||||
sprintf (dummy, "key size too large; supplied length: %d, max: %d",
|
||||
Z_STRLEN_PP(key), max_key_size);
|
||||
php_error (E_NOTICE, dummy);
|
||||
}
|
||||
strncpy (key_s, Z_STRVAL_PP(key), key_size);
|
||||
memcpy (key_s, Z_STRVAL_PP(key), Z_STRLEN_PP(key));
|
||||
|
||||
if (Z_STRLEN_PP(iv) != iv_size) {
|
||||
sprintf (dummy, "iv size incorrect; supplied length: %d, needed: %d",
|
||||
Z_STRLEN_PP(iv), iv_size);
|
||||
php_error (E_WARNING, dummy);
|
||||
}
|
||||
strncpy (iv_s, Z_STRVAL_PP(iv), iv_size);
|
||||
memcpy (iv_s, Z_STRVAL_PP(iv), iv_size);
|
||||
|
||||
RETVAL_LONG (mcrypt_generic_init (td, key_s, key_size, iv_s));
|
||||
RETVAL_LONG (mcrypt_generic_init (td, key_s, Z_STRLEN_PP(key), iv_s));
|
||||
efree (iv_s);
|
||||
efree (key_s);
|
||||
}
|
||||
@@ -487,7 +489,7 @@ PHP_FUNCTION(mcrypt_generic)
|
||||
zval **data, **mcryptind;
|
||||
MCRYPT td;
|
||||
int argc;
|
||||
char* data_s;
|
||||
unsigned char* data_s;
|
||||
int block_size, data_size;
|
||||
MCLS_FETCH();
|
||||
|
||||
@@ -1234,13 +1236,15 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
|
||||
}
|
||||
key_length_sizes = mcrypt_enc_get_supported_key_sizes (td, &count);
|
||||
if (count == 0 && key_length_sizes == NULL) { /* all lengths 1 - k_l_s = OK */
|
||||
key_s = estrdup (Z_STRVAL_PP(key));
|
||||
use_key_length = Z_STRLEN_PP(key);
|
||||
key_s = emalloc (use_key_length);
|
||||
memset (key_s, 0, use_key_length);
|
||||
memcpy (key_s, Z_STRVAL_PP(key), use_key_length);
|
||||
}
|
||||
else if (count == 1) { /* only m_k_l = OK */
|
||||
key_s = emalloc (key_length_sizes[0]);
|
||||
memset (key_s, 0, key_length_sizes[0]);
|
||||
strcpy (key_s, Z_STRVAL_PP(key));
|
||||
memcpy (key_s, Z_STRVAL_PP(key), Z_STRLEN_PP(key));
|
||||
use_key_length = key_length_sizes[0];
|
||||
}
|
||||
else { /* derterminating smallest supported key > length of requested key */
|
||||
@@ -1254,7 +1258,7 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
|
||||
}
|
||||
key_s = emalloc (use_key_length);
|
||||
memset (key_s, 0, use_key_length);
|
||||
strcpy (key_s, Z_STRVAL_PP(key));
|
||||
memcpy (key_s, Z_STRVAL_PP(key), Z_STRLEN_PP(key));
|
||||
}
|
||||
mcrypt_free (key_length_sizes);
|
||||
|
||||
@@ -1294,7 +1298,7 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
|
||||
memset (data_s, 0, data_size);
|
||||
memcpy (data_s, Z_STRVAL_PP(data), Z_STRLEN_PP(data));
|
||||
}
|
||||
|
||||
|
||||
if (mcrypt_generic_init (td, key_s, use_key_length, iv_s) < 0) {
|
||||
php_error (E_ERROR, "generic_init failed");
|
||||
}
|
||||
@@ -1307,10 +1311,10 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
|
||||
|
||||
/* freeing vars */
|
||||
mcrypt_generic_end (td);
|
||||
if (iv_s != NULL)
|
||||
efree (iv_s);
|
||||
if (key_s != NULL)
|
||||
efree (key_s);
|
||||
if (iv_s != NULL)
|
||||
efree (iv_s);
|
||||
efree (data_s);
|
||||
mcrypt_module_close (td);
|
||||
}
|
||||
|
||||
@@ -342,11 +342,16 @@ PHP_MINIT_FUNCTION(oci)
|
||||
{
|
||||
zend_class_entry oci_lob_class_entry;
|
||||
|
||||
/* XXX Joe Brown says OCI_THREADED breaks windows, assuming the same is true for unix - tc
|
||||
#ifdef ZTS
|
||||
#define PHP_OCI_INIT_MODE OCI_THREADED
|
||||
#else
|
||||
*/
|
||||
#define PHP_OCI_INIT_MODE OCI_DEFAULT
|
||||
|
||||
/*
|
||||
#endif
|
||||
*/
|
||||
|
||||
#if OCI_USE_EMALLOC
|
||||
OCIInitialize(PHP_OCI_INIT_MODE, NULL, ocimalloc, ocirealloc, ocifree);
|
||||
|
||||
@@ -158,7 +158,7 @@ if test "$PHP_ORACLE" != "no"; then
|
||||
PHP_EXTENSION(oracle, $ext_shared)
|
||||
AC_DEFINE(HAVE_ORACLE,1,[ ])
|
||||
|
||||
PHP_SUBST(ORACLE_SHARED_LIBADD)
|
||||
PHP_SUBST(ORACLE_DIR)
|
||||
PHP_SUBST_OLD(ORACLE_SHARED_LIBADD)
|
||||
PHP_SUBST_OLD(ORACLE_DIR)
|
||||
PHP_SUBST_OLD(ORACLE_VERSION)
|
||||
fi
|
||||
+20
-9
@@ -148,23 +148,25 @@ static void _close_pgsql_plink(zend_rsrc_list_entry *rsrc)
|
||||
PGG(num_links)--;
|
||||
}
|
||||
|
||||
static void _be_quiet(void * arg, const char * message)
|
||||
|
||||
static void
|
||||
_notice_handler(void *arg, const char *message)
|
||||
{
|
||||
PGLS_FETCH();
|
||||
|
||||
if (! PGG(ignore_notices)) {
|
||||
php_log_err(message);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static int _rollback_transactions(zend_rsrc_list_entry *rsrc)
|
||||
{
|
||||
PGconn *link = (PGconn *)rsrc->ptr;
|
||||
PQnoticeProcessor old_notice_hook;
|
||||
|
||||
/* we set the PQsetNoticeProcessor to avoid the stupid
|
||||
* "NOTICE: BEGIN: already a transaction in progress"
|
||||
* message
|
||||
*/
|
||||
|
||||
old_notice_hook = PQsetNoticeProcessor(link, _be_quiet, NULL);
|
||||
PGG(ignore_notices) = 1;
|
||||
PQexec(link,"BEGIN;ROLLBACK;");
|
||||
PQsetNoticeProcessor(link, old_notice_hook, NULL);
|
||||
PGG(ignore_notices) = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -194,6 +196,7 @@ PHP_INI_END()
|
||||
static void php_pgsql_init_globals(PGLS_D)
|
||||
{
|
||||
PGG(num_persistent) = 0;
|
||||
PGG(ignore_notices) = 0;
|
||||
}
|
||||
|
||||
PHP_MINIT_FUNCTION(pgsql)
|
||||
@@ -262,6 +265,8 @@ PHP_MINFO_FUNCTION(pgsql)
|
||||
DISPLAY_INI_ENTRIES();
|
||||
|
||||
}
|
||||
|
||||
|
||||
void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
|
||||
{
|
||||
char *host=NULL,*port=NULL,*options=NULL,*tty=NULL,*dbname=NULL,*connstring=NULL;
|
||||
@@ -377,6 +382,8 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
PQsetNoticeProcessor(pgsql, _notice_handler, NULL);
|
||||
|
||||
/* hash it up */
|
||||
new_le.type = le_plink;
|
||||
new_le.ptr = pgsql;
|
||||
@@ -405,6 +412,8 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
|
||||
}
|
||||
}
|
||||
pgsql = (PGconn *) le->ptr;
|
||||
|
||||
PQsetNoticeProcessor(pgsql, _notice_handler, NULL);
|
||||
}
|
||||
ZEND_REGISTER_RESOURCE(return_value, pgsql, le_plink);
|
||||
} else {
|
||||
@@ -451,6 +460,8 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
PQsetNoticeProcessor(pgsql, _notice_handler, NULL);
|
||||
|
||||
/* add it to the list */
|
||||
ZEND_REGISTER_RESOURCE(return_value, pgsql, le_link);
|
||||
|
||||
|
||||
@@ -119,6 +119,7 @@ typedef struct {
|
||||
long max_links,max_persistent;
|
||||
long allow_persistent;
|
||||
int le_lofp,le_string;
|
||||
int ignore_notices;
|
||||
} php_pgsql_globals;
|
||||
|
||||
|
||||
|
||||
+222
-110
@@ -50,27 +50,17 @@
|
||||
|
||||
#define _WIN32_DCOM
|
||||
|
||||
#ifdef CP_THREAD_ACP
|
||||
#define PHP_COM_CODEPAGE CP_THREAD_ACP
|
||||
#else
|
||||
#define PHP_COM_CODEPAGE CP_ACP
|
||||
#endif
|
||||
|
||||
#include <iostream.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "php.h"
|
||||
#include "php_ini.h"
|
||||
#include "com.h"
|
||||
|
||||
#include "conversion.h"
|
||||
#include "unknwn.h"
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
|
||||
zend_class_entry com_class_entry;
|
||||
|
||||
END_EXTERN_C()
|
||||
|
||||
PHP_FUNCTION(COM_load);
|
||||
PHP_FUNCTION(COM_invoke);
|
||||
PHP_FUNCTION(com_propget);
|
||||
@@ -101,27 +91,94 @@ static PHP_MINFO_FUNCTION(COM)
|
||||
|
||||
static int php_COM_load_typelib(char *typelib_name, int mode);
|
||||
|
||||
PHPAPI HRESULT php_COM_invoke(i_dispatch *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult)
|
||||
{
|
||||
if(obj->typelib) {
|
||||
return obj->i.dispatch->lpVtbl->Invoke(obj->i.dispatch, dispIdMember, &IID_NULL, LOCALE_SYSTEM_DEFAULT,
|
||||
wFlags, pDispParams, pVarResult, NULL, NULL);
|
||||
} else {
|
||||
return obj->i.typeinfo->lpVtbl->Invoke(obj->i.typeinfo, obj->i.dispatch, dispIdMember,
|
||||
wFlags, pDispParams, pVarResult, NULL, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_get_ids_of_names(i_dispatch *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId)
|
||||
{
|
||||
if(obj->typelib) {
|
||||
return obj->i.dispatch->lpVtbl->GetIDsOfNames(obj->i.dispatch, &IID_NULL, rgszNames, 1, LOCALE_SYSTEM_DEFAULT, rgDispId);
|
||||
} else {
|
||||
return obj->i.typeinfo->lpVtbl->GetIDsOfNames(obj->i.typeinfo, rgszNames, 1, rgDispId);
|
||||
}
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_release(i_dispatch *obj)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
hr = obj->i.dispatch->lpVtbl->Release(obj->i.dispatch);
|
||||
obj->i.dispatch = NULL;
|
||||
obj->i.typeinfo = NULL;
|
||||
obj->typelib = FALSE;
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_set(i_dispatch *obj, IDispatch FAR* pDisp, int cleanup)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
obj->i.dispatch = pDisp;
|
||||
obj->typelib = !FAILED(obj->i.dispatch->lpVtbl->GetTypeInfo(obj->i.dispatch, 0, LANG_NEUTRAL, &obj->i.typeinfo));
|
||||
|
||||
if(cleanup) {
|
||||
pDisp = NULL;
|
||||
} else {
|
||||
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
|
||||
}
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
PHPAPI HRESULT php_COM_clone(i_dispatch *obj, i_dispatch *clone, int cleanup)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
obj->typelib = clone->typelib;
|
||||
obj->i.dispatch = clone->i.dispatch;
|
||||
obj->i.typeinfo = clone->i.typeinfo;
|
||||
|
||||
if(cleanup) {
|
||||
obj->i.dispatch = NULL;
|
||||
obj->i.typeinfo = NULL;
|
||||
obj->typelib = FALSE;
|
||||
} else {
|
||||
hr = obj->i.dispatch->lpVtbl->AddRef(obj->i.dispatch);
|
||||
}
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
PHPAPI char *php_COM_error_message(HRESULT hr)
|
||||
{
|
||||
char *pMsgBuf;
|
||||
void *pMsgBuf;
|
||||
|
||||
if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
|
||||
hr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pMsgBuf, 0, NULL)) {
|
||||
char error_string[] = "No description available";
|
||||
|
||||
pMsgBuf = (char *) LocalAlloc(LMEM_FIXED, sizeof(error_string));
|
||||
pMsgBuf = LocalAlloc(LMEM_FIXED, sizeof(error_string));
|
||||
memcpy(pMsgBuf, error_string, sizeof(error_string));
|
||||
}
|
||||
|
||||
return pMsgBuf;
|
||||
}
|
||||
|
||||
static char *php_string_from_clsid(const CLSID clsid)
|
||||
static char *php_string_from_clsid(const CLSID *clsid)
|
||||
{
|
||||
LPOLESTR ole_clsid;
|
||||
char *clsid_str;
|
||||
|
||||
StringFromCLSID(&clsid, &ole_clsid);
|
||||
StringFromCLSID(clsid, &ole_clsid);
|
||||
clsid_str = php_OLECHAR_to_char(ole_clsid, NULL, 0, codepage);
|
||||
LocalFree(ole_clsid);
|
||||
|
||||
@@ -130,9 +187,9 @@ static char *php_string_from_clsid(const CLSID clsid)
|
||||
|
||||
static void php_idispatch_destructor(zend_rsrc_list_entry *rsrc)
|
||||
{
|
||||
IDispatch *i_dispatch = (IDispatch *)rsrc->ptr;
|
||||
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
i_dispatch *obj = (i_dispatch *)rsrc->ptr;
|
||||
php_COM_release(obj);
|
||||
efree(obj);
|
||||
}
|
||||
|
||||
static PHP_INI_MH(OnTypelibFileChange)
|
||||
@@ -199,12 +256,12 @@ static PHP_INI_MH(OnTypelibFileChange)
|
||||
|
||||
|
||||
PHP_INI_BEGIN()
|
||||
PHP_INI_ENTRY1_EX("allow_dcom", "0", PHP_INI_SYSTEM, NULL, NULL, php_ini_boolean_displayer_cb)
|
||||
PHP_INI_ENTRY1("typelib_file", NULL, PHP_INI_SYSTEM, OnTypelibFileChange, NULL)
|
||||
PHP_INI_ENTRY_EX("com.allow_dcom", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb)
|
||||
PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange)
|
||||
PHP_INI_END()
|
||||
|
||||
|
||||
/* {{{ proto int com_load(string module_name)
|
||||
/* {{{ proto int com_load(string module_name [, string remote_host [, int codepage]])
|
||||
Loads a COM module */
|
||||
PHP_FUNCTION(COM_load)
|
||||
{
|
||||
@@ -212,7 +269,7 @@ PHP_FUNCTION(COM_load)
|
||||
CLSID clsid;
|
||||
HRESULT hr;
|
||||
OLECHAR *ProgID;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
char *error_message;
|
||||
char *clsid_str;
|
||||
|
||||
@@ -222,7 +279,7 @@ PHP_FUNCTION(COM_load)
|
||||
codepage = CP_ACP;
|
||||
break;
|
||||
case 2:
|
||||
if (!INI_INT("allow_dcom")) {
|
||||
if (!INI_INT("com.allow_dcom")) {
|
||||
php_error(E_WARNING, "DCOM is disabled");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@@ -237,7 +294,7 @@ PHP_FUNCTION(COM_load)
|
||||
efree(server_name);
|
||||
server_name = NULL;
|
||||
} else {
|
||||
if (!INI_INT("allow_dcom")) {
|
||||
if (!INI_INT("com.allow_dcom")) {
|
||||
php_error(E_WARNING, "DCOM is disabled");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@@ -254,7 +311,7 @@ PHP_FUNCTION(COM_load)
|
||||
|
||||
convert_to_string(module_name);
|
||||
ProgID = php_char_to_OLECHAR(module_name->value.str.val, module_name->value.str.len, codepage);
|
||||
hr = CLSIDFromProgID(ProgID, &clsid);
|
||||
hr=CLSIDFromProgID(ProgID, &clsid);
|
||||
efree(ProgID);
|
||||
|
||||
/* obtain CLSID */
|
||||
@@ -265,9 +322,12 @@ PHP_FUNCTION(COM_load)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
|
||||
/* obtain IDispatch */
|
||||
if (!server_name) {
|
||||
hr = CoCreateInstance(&clsid, NULL, CLSCTX_SERVER, &IID_IDispatch, (LPVOID *) &i_dispatch);
|
||||
hr = CoCreateInstance(&clsid, NULL, CLSCTX_SERVER, &IID_IDispatch, (LPVOID *) &(obj->i.dispatch));
|
||||
php_COM_set(obj, obj->i.dispatch, TRUE);
|
||||
} else {
|
||||
COSERVERINFO server_info;
|
||||
MULTI_QI pResults;
|
||||
@@ -283,27 +343,28 @@ PHP_FUNCTION(COM_load)
|
||||
hr=CoCreateInstanceEx(&clsid, NULL, CLSCTX_SERVER, &server_info, 1, &pResults);
|
||||
if (SUCCEEDED(hr)) {
|
||||
hr = pResults.hr;
|
||||
i_dispatch = (IDispatch *) pResults.pItf;
|
||||
obj->i.dispatch = (IDispatch *) pResults.pItf;
|
||||
php_COM_set(obj, obj->i.dispatch, TRUE);
|
||||
}
|
||||
efree(server_info.pwszName);
|
||||
}
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
clsid_str = php_string_from_clsid(clsid);
|
||||
clsid_str = php_string_from_clsid(&clsid);
|
||||
php_error(E_WARNING,"Unable to obtain IDispatch interface for CLSID %s: %s",clsid_str,error_message);
|
||||
LocalFree(error_message);
|
||||
efree(clsid_str);
|
||||
efree(obj);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
||||
RETURN_LONG(zend_list_insert(i_dispatch,le_idispatch));
|
||||
RETURN_LONG(zend_list_insert(obj, le_idispatch));
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
||||
int do_COM_invoke(IDispatch *i_dispatch, pval *function_name, VARIANTARG *var_result, pval **arguments, int arg_count)
|
||||
int do_COM_invoke(i_dispatch *obj, pval *function_name, VARIANTARG *var_result, pval **arguments, int arg_count)
|
||||
{
|
||||
DISPID dispid;
|
||||
HRESULT hr;
|
||||
@@ -315,7 +376,7 @@ int do_COM_invoke(IDispatch *i_dispatch, pval *function_name, VARIANTARG *var_re
|
||||
|
||||
funcname = php_char_to_OLECHAR(function_name->value.str.val, function_name->value.str.len, codepage);
|
||||
|
||||
hr = i_dispatch->lpVtbl->GetIDsOfNames(i_dispatch, &IID_NULL, &funcname, 1, LOCALE_SYSTEM_DEFAULT, &dispid);
|
||||
hr = php_COM_get_ids_of_names(obj, &funcname, &dispid);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -337,9 +398,7 @@ int do_COM_invoke(IDispatch *i_dispatch, pval *function_name, VARIANTARG *var_re
|
||||
dispparams.cArgs = arg_count;
|
||||
dispparams.cNamedArgs = 0;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL,
|
||||
LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD|DISPATCH_PROPERTYGET,
|
||||
&dispparams, var_result, NULL, NULL);
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, var_result);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -362,7 +421,7 @@ PHP_FUNCTION(COM_invoke)
|
||||
{
|
||||
pval **arguments;
|
||||
pval *object, *function_name;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
int type;
|
||||
int arg_count = ZEND_NUM_ARGS();
|
||||
VARIANTARG var_result;
|
||||
@@ -378,10 +437,10 @@ PHP_FUNCTION(COM_invoke)
|
||||
object = arguments[0];
|
||||
function_name = arguments[1];
|
||||
|
||||
/* obtain i_dispatch interface */
|
||||
/* obtain IDispatch interface */
|
||||
convert_to_long(object);
|
||||
i_dispatch = (IDispatch *)zend_list_find(object->value.lval, &type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find(object->value.lval, &type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
php_error(E_WARNING,"%d is not a COM object handler", function_name->value.str.val);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@@ -389,7 +448,7 @@ PHP_FUNCTION(COM_invoke)
|
||||
/* obtain property/method handler */
|
||||
convert_to_string(function_name);
|
||||
|
||||
if (do_COM_invoke(i_dispatch, function_name, &var_result, arguments+2, arg_count-2)==FAILURE) {
|
||||
if (do_COM_invoke(obj, function_name, &var_result, arguments+2, arg_count-2)==FAILURE) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
efree(arguments);
|
||||
@@ -403,16 +462,21 @@ static int do_COM_offget(VARIANTARG *var_result, VARIANTARG *array, pval *arg_pr
|
||||
switch (array->vt) {
|
||||
case VT_DISPATCH: { /* a Collection, possibly */
|
||||
pval function_name;
|
||||
IDispatch *i_dispatch = array->pdispVal;
|
||||
i_dispatch *obj;
|
||||
int retval;
|
||||
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
php_COM_set(obj, array->pdispVal, TRUE);
|
||||
|
||||
function_name.value.str.val = "Item";
|
||||
function_name.value.str.len = 4;
|
||||
function_name.type = IS_STRING;
|
||||
retval = do_COM_invoke(i_dispatch, &function_name, var_result, &arg_property, 1);
|
||||
retval = do_COM_invoke(obj, &function_name, var_result, &arg_property, 1);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
efree(obj);
|
||||
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
@@ -420,7 +484,7 @@ static int do_COM_offget(VARIANTARG *var_result, VARIANTARG *array, pval *arg_pr
|
||||
}
|
||||
|
||||
|
||||
static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *arg_property, int cleanup)
|
||||
static int do_COM_propget(VARIANTARG *var_result, i_dispatch *obj, pval *arg_property, int cleanup)
|
||||
{
|
||||
DISPID dispid;
|
||||
HRESULT hr;
|
||||
@@ -432,7 +496,7 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
/* obtain property handler */
|
||||
propname = php_char_to_OLECHAR(arg_property->value.str.val, arg_property->value.str.len, codepage);
|
||||
|
||||
hr = i_dispatch->lpVtbl->GetIDsOfNames(i_dispatch, &IID_NULL, &propname, 1, LOCALE_SYSTEM_DEFAULT, &dispid);
|
||||
hr = php_COM_get_ids_of_names(obj, &propname, &dispid);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -440,7 +504,7 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
LocalFree(error_message);
|
||||
efree(propname);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
return FAILURE;
|
||||
}
|
||||
@@ -448,7 +512,7 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
dispparams.cArgs = 0;
|
||||
dispparams.cNamedArgs = 0;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispparams, var_result, NULL, 0);
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYGET, &dispparams, var_result);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -456,35 +520,37 @@ static int do_COM_propget(VARIANTARG *var_result, IDispatch *i_dispatch, pval *a
|
||||
LocalFree(error_message);
|
||||
efree(propname);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
efree(propname);
|
||||
if (cleanup) {
|
||||
i_dispatch->lpVtbl->Release(i_dispatch);
|
||||
php_COM_release(obj);
|
||||
}
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
static void do_COM_propput(pval *return_value, IDispatch *i_dispatch, pval *arg_property, pval *value)
|
||||
static void do_COM_propput(pval *return_value, i_dispatch *obj, pval *arg_property, pval *value)
|
||||
{
|
||||
DISPID dispid;
|
||||
HRESULT hr;
|
||||
OLECHAR *propname;
|
||||
char *error_message;
|
||||
VARIANTARG var_result;
|
||||
VARIANT *var_result;
|
||||
DISPPARAMS dispparams;
|
||||
VARIANTARG new_value;
|
||||
DISPID mydispid = DISPID_PROPERTYPUT;
|
||||
|
||||
|
||||
var_result = emalloc(sizeof(VARIANT));
|
||||
|
||||
/* obtain property handler */
|
||||
propname = php_char_to_OLECHAR(arg_property->value.str.val, arg_property->value.str.len, codepage);
|
||||
|
||||
hr = i_dispatch->lpVtbl->GetIDsOfNames(i_dispatch, &IID_NULL, &propname, 1, LOCALE_SYSTEM_DEFAULT, &dispid);
|
||||
hr = php_COM_get_ids_of_names(obj, &propname, &dispid);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
@@ -494,16 +560,14 @@ static void do_COM_propput(pval *return_value, IDispatch *i_dispatch, pval *arg_
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
||||
php_pval_to_variant(value, &new_value, codepage);
|
||||
dispparams.rgvarg = &new_value;
|
||||
dispparams.rgdispidNamedArgs = &mydispid;
|
||||
dispparams.cArgs = 1;
|
||||
dispparams.cNamedArgs = 1;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL,
|
||||
LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT,
|
||||
&dispparams, NULL, NULL, 0);
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYPUT, &dispparams, NULL);
|
||||
|
||||
if (FAILED(hr)) {
|
||||
error_message = php_COM_error_message(hr);
|
||||
php_error(E_WARNING,"PropPut() failed: %s\n", error_message);
|
||||
@@ -515,18 +579,16 @@ static void do_COM_propput(pval *return_value, IDispatch *i_dispatch, pval *arg_
|
||||
dispparams.cArgs = 0;
|
||||
dispparams.cNamedArgs = 0;
|
||||
|
||||
hr = i_dispatch->lpVtbl->Invoke(i_dispatch, dispid, &IID_NULL,
|
||||
LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET,
|
||||
&dispparams, &var_result, NULL, 0);
|
||||
|
||||
hr = php_COM_invoke(obj, dispid, DISPATCH_PROPERTYGET, &dispparams, var_result);
|
||||
|
||||
if (SUCCEEDED(hr)) {
|
||||
php_variant_to_pval(&var_result, return_value, 0, codepage);
|
||||
php_variant_to_pval(var_result, return_value, 0, codepage);
|
||||
} else {
|
||||
*return_value = *value;
|
||||
zval_copy_ctor(return_value);
|
||||
}
|
||||
|
||||
efree(var_result);
|
||||
efree(propname);
|
||||
}
|
||||
|
||||
@@ -537,23 +599,22 @@ PHP_FUNCTION(com_propget)
|
||||
{
|
||||
pval *arg_idispatch, *arg_property;
|
||||
int type;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
VARIANTARG var_result;
|
||||
|
||||
if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &arg_idispatch, &arg_property)==FAILURE) {
|
||||
WRONG_PARAM_COUNT;
|
||||
}
|
||||
|
||||
/* obtain i_dispatch interface */
|
||||
/* obtain IDispatch interface */
|
||||
convert_to_long(arg_idispatch);
|
||||
/* obtain i_dispatch interface */
|
||||
i_dispatch = (IDispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
php_error(E_WARNING,"%d is not a COM object handler", arg_idispatch->value.lval);
|
||||
}
|
||||
convert_to_string(arg_property);
|
||||
|
||||
if (do_COM_propget(&var_result, i_dispatch, arg_property, 0)==FAILURE) {
|
||||
if (do_COM_propget(&var_result, obj, arg_property, 0)==FAILURE) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
php_variant_to_pval(&var_result, return_value, 0, codepage);
|
||||
@@ -567,7 +628,7 @@ PHP_FUNCTION(com_propput)
|
||||
{
|
||||
pval *arg_idispatch, *arg_property, *arg_value;
|
||||
int type;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
|
||||
if (ZEND_NUM_ARGS()!=3 || getParameters(ht, 3, &arg_idispatch, &arg_property, &arg_value)==FAILURE) {
|
||||
WRONG_PARAM_COUNT;
|
||||
@@ -576,62 +637,72 @@ PHP_FUNCTION(com_propput)
|
||||
/* obtain i_dispatch interface */
|
||||
convert_to_long(arg_idispatch);
|
||||
/* obtain i_dispatch interface */
|
||||
i_dispatch = (IDispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find(arg_idispatch->value.lval,&type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
php_error(E_WARNING,"%d is not a COM object handler", arg_idispatch->value.lval);
|
||||
}
|
||||
convert_to_string(arg_property);
|
||||
|
||||
do_COM_propput(return_value, i_dispatch, arg_property, arg_value);
|
||||
do_COM_propput(return_value, obj, arg_property, arg_value);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
||||
VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_reference)
|
||||
VARIANT *_php_COM_get_property_handler(zend_property_reference *property_reference)
|
||||
{
|
||||
zend_overloaded_element *overloaded_property;
|
||||
zend_llist_element *element;
|
||||
pval **idispatch_handle;
|
||||
pval *object = property_reference->object;
|
||||
IDispatch *i_dispatch;
|
||||
int type;
|
||||
VARIANTARG var_result;
|
||||
VARIANT *var_result;
|
||||
i_dispatch *obj, *obj_prop;
|
||||
|
||||
|
||||
/* fetch the IDispatch interface */
|
||||
zend_hash_index_find(object->value.obj.properties, 0, (void **) &idispatch_handle);
|
||||
i_dispatch = (IDispatch *)zend_list_find((*idispatch_handle)->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
return var_result;
|
||||
obj = (i_dispatch *) zend_list_find((*idispatch_handle)->value.lval, &type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
var_result.vt = VT_DISPATCH;
|
||||
var_result.pdispVal = i_dispatch;
|
||||
obj_prop = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
php_COM_clone(obj_prop, obj, FALSE);
|
||||
|
||||
var_result = (VARIANT *) emalloc(sizeof(VARIANT));
|
||||
var_result->vt = VT_DISPATCH;
|
||||
var_result->pdispVal = obj_prop->i.dispatch;
|
||||
|
||||
for (element=property_reference->elements_list->head; element; element=element->next) {
|
||||
overloaded_property = (zend_overloaded_element *) element->data;
|
||||
switch (overloaded_property->type) {
|
||||
case OE_IS_ARRAY:
|
||||
if (do_COM_offget(&var_result, &var_result, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
if (do_COM_offget(var_result, var_result, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result->vt = VT_EMPTY;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
}
|
||||
/*printf("Array offset: ");*/
|
||||
break;
|
||||
|
||||
case OE_IS_OBJECT:
|
||||
if (var_result.vt != VT_DISPATCH) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
if (var_result->vt != VT_DISPATCH) {
|
||||
var_result->vt = VT_EMPTY;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
} else {
|
||||
if (do_COM_propget(&var_result, var_result.pdispVal, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result.vt = VT_EMPTY;
|
||||
php_COM_set(obj_prop, var_result->pdispVal, TRUE);
|
||||
if (do_COM_propget(var_result, obj_prop, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) {
|
||||
var_result->vt = VT_EMPTY;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
}
|
||||
/*printf("Object property: ");*/
|
||||
|
||||
}
|
||||
break;
|
||||
|
||||
case OE_IS_METHOD:
|
||||
var_result->pdispVal = obj_prop->i.dispatch;
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
break;
|
||||
}
|
||||
@@ -647,15 +718,17 @@ VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_refer
|
||||
*/
|
||||
pval_destructor(&overloaded_property->element);
|
||||
}
|
||||
efree(obj_prop);
|
||||
return var_result;
|
||||
}
|
||||
|
||||
PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_reference)
|
||||
{
|
||||
pval result;
|
||||
VARIANTARG var_result = _php_COM_get_property_handler(property_reference);
|
||||
VARIANT *var_result = _php_COM_get_property_handler(property_reference);
|
||||
|
||||
php_variant_to_pval(&var_result, &result, 0, codepage);
|
||||
php_variant_to_pval(var_result, &result, 0, codepage);
|
||||
efree(var_result);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -667,19 +740,19 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
|
||||
zend_llist_element *element;
|
||||
pval **idispatch_handle;
|
||||
pval *object = property_reference->object;
|
||||
IDispatch *i_dispatch;
|
||||
i_dispatch *obj;
|
||||
int type;
|
||||
VARIANTARG var_result;
|
||||
|
||||
|
||||
/* fetch the IDispatch interface */
|
||||
zend_hash_index_find(object->value.obj.properties, 0, (void **) &idispatch_handle);
|
||||
i_dispatch = (IDispatch *)zend_list_find((*idispatch_handle)->value.lval,&type);
|
||||
if (!i_dispatch || (type!=le_idispatch)) {
|
||||
obj = (i_dispatch *)zend_list_find((*idispatch_handle)->value.lval,&type);
|
||||
if (!obj || (type!=le_idispatch)) {
|
||||
return FAILURE;
|
||||
}
|
||||
var_result.vt = VT_DISPATCH;
|
||||
var_result.pdispVal = i_dispatch;
|
||||
var_result.pdispVal = obj->i.dispatch;
|
||||
|
||||
for (element=property_reference->elements_list->head; element && element!=property_reference->elements_list->tail; element=element->next) {
|
||||
overloaded_property = (zend_overloaded_element *) element->data;
|
||||
@@ -691,7 +764,8 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
|
||||
if (var_result.vt != VT_DISPATCH) {
|
||||
return FAILURE;
|
||||
} else {
|
||||
do_COM_propget(&var_result, i_dispatch, &overloaded_property->element, element!=property_reference->elements_list->head);
|
||||
// ??????
|
||||
do_COM_propget(&var_result, obj, &overloaded_property->element, element!=property_reference->elements_list->head);
|
||||
/*printf("Object property: ");*/
|
||||
}
|
||||
break;
|
||||
@@ -715,9 +789,15 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
|
||||
if (var_result.vt != VT_DISPATCH) {
|
||||
return FAILURE;
|
||||
}
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
obj->typelib = FALSE;
|
||||
obj->i.dispatch = var_result.pdispVal;
|
||||
|
||||
overloaded_property = (zend_overloaded_element *) element->data;
|
||||
do_COM_propput(&result, var_result.pdispVal, &overloaded_property->element, value);
|
||||
do_COM_propput(&result, obj, &overloaded_property->element, value);
|
||||
pval_destructor(&overloaded_property->element);
|
||||
efree(obj);
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
@@ -745,24 +825,26 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
|
||||
zend_hash_index_update(object->value.obj.properties, 0, &object_handle, sizeof(pval *), NULL);
|
||||
pval_destructor(&function_name->element);
|
||||
} else {
|
||||
VARIANTARG object_handle = _php_COM_get_property_handler(property_reference);
|
||||
i_dispatch *obj;
|
||||
pval **arguments;
|
||||
int arg_count = ZEND_NUM_ARGS();
|
||||
VARIANTARG var_result;
|
||||
|
||||
var_result.vt = VT_EMPTY;
|
||||
|
||||
if (object_handle.vt != VT_DISPATCH) {
|
||||
/* that shouldn't happen */
|
||||
return;
|
||||
}
|
||||
obj = (i_dispatch *) emalloc(sizeof(i_dispatch));
|
||||
php_COM_set(obj, _php_COM_get_property_handler(property_reference)->pdispVal, TRUE);
|
||||
|
||||
arguments = (pval **) emalloc(sizeof(pval *)*arg_count);
|
||||
getParametersArray(ht, arg_count, arguments);
|
||||
|
||||
if (do_COM_invoke((IDispatch *) object_handle.pdispVal, &function_name->element, &var_result, arguments, arg_count)==FAILURE) {
|
||||
if (do_COM_invoke(obj , &function_name->element, &var_result, arguments, arg_count)==FAILURE) {
|
||||
RETVAL_FALSE;
|
||||
}
|
||||
|
||||
pval_destructor(&function_name->element);
|
||||
php_COM_release(obj);
|
||||
efree(obj);
|
||||
efree(arguments);
|
||||
php_variant_to_pval(&var_result, return_value, 0, codepage);
|
||||
}
|
||||
@@ -788,18 +870,52 @@ static int php_COM_load_typelib(char *typelib_name, int mode)
|
||||
ITypeLib *TypeLib;
|
||||
ITypeComp *TypeComp;
|
||||
OLECHAR *p;
|
||||
CLSID clsid;
|
||||
char *strtok_buf, *major, *minor;
|
||||
int i;
|
||||
int interfaces;
|
||||
ELS_FETCH();
|
||||
|
||||
|
||||
typelib_name = php_strtok_r(typelib_name, ",", &strtok_buf);
|
||||
major = php_strtok_r(NULL, ",", &strtok_buf);
|
||||
minor = php_strtok_r(NULL, ",", &strtok_buf);
|
||||
|
||||
p = php_char_to_OLECHAR(typelib_name, strlen(typelib_name), codepage);
|
||||
|
||||
if (FAILED(LoadTypeLib(p, &TypeLib))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
if (!FAILED(CLSIDFromString(p, &clsid))) {
|
||||
HRESULT hr;
|
||||
|
||||
if (major && minor) {
|
||||
hr = LoadRegTypeLib((REFGUID) &clsid, 1, 0, LANG_NEUTRAL, &TypeLib);
|
||||
}
|
||||
|
||||
if (!major || !minor || FAILED(hr)) {
|
||||
IDispatch *i_dispatch;
|
||||
ITypeInfo *TypeInfo;
|
||||
int idx;
|
||||
|
||||
if (FAILED(CoCreateInstance(&clsid, NULL, CLSCTX_SERVER, &IID_IDispatch, (LPVOID *) &i_dispatch))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
if (FAILED(i_dispatch->lpVtbl->GetTypeInfo(i_dispatch, 0, LANG_NEUTRAL, &TypeInfo))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
if (FAILED(TypeInfo->lpVtbl->GetContainingTypeLib(TypeInfo, &TypeLib, &idx))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (FAILED(LoadTypeLib(p, &TypeLib))) {
|
||||
efree(p);
|
||||
return FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
interfaces = TypeLib->lpVtbl->GetTypeInfoCount(TypeLib);
|
||||
interfaces = TypeLib->lpVtbl->GetTypeInfoCount(TypeLib);
|
||||
|
||||
TypeLib->lpVtbl->GetTypeComp(TypeLib, &TypeComp);
|
||||
for (i=0; i<interfaces; i++) {
|
||||
@@ -865,7 +981,6 @@ void php_register_COM_class()
|
||||
zend_register_internal_class(&com_class_entry);
|
||||
}
|
||||
|
||||
|
||||
PHP_MINIT_FUNCTION(COM)
|
||||
{
|
||||
CoInitialize(NULL);
|
||||
@@ -883,7 +998,6 @@ PHP_MSHUTDOWN_FUNCTION(COM)
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
// exports for external object creation
|
||||
|
||||
zend_module_entry COM_module_entry = {
|
||||
@@ -894,6 +1008,4 @@ PHPAPI int php_COM_get_le_idispatch() {
|
||||
return le_idispatch;
|
||||
}
|
||||
|
||||
END_EXTERN_C()
|
||||
|
||||
#endif
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#if PHP_WIN32
|
||||
|
||||
BEGIN_EXTERN_C()
|
||||
#include "com.h"
|
||||
|
||||
extern PHP_MINIT_FUNCTION(COM);
|
||||
extern PHP_MSHUTDOWN_FUNCTION(COM);
|
||||
@@ -13,17 +13,11 @@ extern int php_COM_get_le_idispatch();
|
||||
extern zend_module_entry COM_module_entry;
|
||||
extern zend_class_entry com_class_entry;
|
||||
|
||||
END_EXTERN_C()
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
extern pval php_COM_get_property_handler(zend_property_reference *property_reference);
|
||||
extern int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
|
||||
extern char *php_COM_error_message(HRESULT hr);
|
||||
extern void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
|
||||
|
||||
#endif
|
||||
|
||||
#define COM_module_ptr &COM_module_entry
|
||||
|
||||
#else
|
||||
|
||||
+30
-30
@@ -69,38 +69,38 @@ PHP_MINIT_FUNCTION(VARIANT)
|
||||
le_variant = zend_register_list_destructors_ex(php_variant_destructor, NULL, "VARIANT", module_number);
|
||||
|
||||
/* variant datatypes */
|
||||
REGISTER_LONG_CONSTANT("VT_NULL", VT_NULL, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_EMPTY", VT_EMPTY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UI1", VT_UI1, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_I2", VT_I2, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_I4", VT_I4, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_R4", VT_R4, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_R8", VT_R8, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_BOOL", VT_BOOL, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_ERROR", VT_ERROR, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_CY", VT_CY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_DATE", VT_CY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_BSTR", VT_BSTR, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_DECIMAL", VT_DECIMAL, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UNKNOWN", VT_UNKNOWN, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_DISPATCH", VT_DISPATCH, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_VARIANT", VT_VARIANT, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_I1", VT_I1, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UI2", VT_UI2, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UI4", VT_UI4, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_INT", VT_INT, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_UINT", VT_UINT, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_ARRAY", VT_ARRAY, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_BYREF", VT_BYREF, 0);
|
||||
REGISTER_LONG_CONSTANT("VT_NULL", VT_NULL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_EMPTY", VT_EMPTY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UI1", VT_UI1, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_I2", VT_I2, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_I4", VT_I4, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_R4", VT_R4, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_R8", VT_R8, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_BOOL", VT_BOOL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_ERROR", VT_ERROR, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_CY", VT_CY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_DATE", VT_CY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_BSTR", VT_BSTR, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_DECIMAL", VT_DECIMAL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UNKNOWN", VT_UNKNOWN, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_DISPATCH", VT_DISPATCH, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_VARIANT", VT_VARIANT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_I1", VT_I1, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UI2", VT_UI2, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UI4", VT_UI4, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_INT", VT_INT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_UINT", VT_UINT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_ARRAY", VT_ARRAY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("VT_BYREF", VT_BYREF, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
/* codepages */
|
||||
REGISTER_LONG_CONSTANT("CP_ACP", CP_ACP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_MACCP", CP_MACCP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_OEMCP", CP_OEMCP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_SYMBOL", CP_SYMBOL, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_THREAD_ACP", CP_THREAD_ACP, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF7", CP_UTF7, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF8", CP_UTF8, 0);
|
||||
REGISTER_LONG_CONSTANT("CP_ACP", CP_ACP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_MACCP", CP_MACCP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_OEMCP", CP_OEMCP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_SYMBOL", CP_SYMBOL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_THREAD_ACP", CP_THREAD_ACP, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF7", CP_UTF7, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CP_UTF8", CP_UTF8, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
php_register_VARIANT_class();
|
||||
return SUCCESS;
|
||||
|
||||
@@ -35,6 +35,10 @@
|
||||
#define _XPG4_2
|
||||
#define __EXTENSIONS__
|
||||
|
||||
#ifndef __PRAGMA_REDEFINE_EXTNAME
|
||||
#define __PRAGMA_REDEFINE_EXTNAME
|
||||
#endif
|
||||
|
||||
#include "ext/standard/info.h"
|
||||
#include "php_sockets.h"
|
||||
#include "php_ini.h"
|
||||
|
||||
+8
-4
@@ -919,7 +919,7 @@ PHP_FUNCTION(fgets)
|
||||
/* needed because recv doesnt put a null at the end*/
|
||||
memset(buf,0,len+1);
|
||||
#ifdef HAVE_FLUSHIO
|
||||
if (!issock) {
|
||||
if (type == le_fopen) {
|
||||
fseek((FILE*)what, 0, SEEK_CUR);
|
||||
}
|
||||
#endif
|
||||
@@ -967,7 +967,7 @@ PHP_FUNCTION(fgetc) {
|
||||
}
|
||||
|
||||
#ifdef HAVE_FLUSHIO
|
||||
if (!issock) {
|
||||
if (type == le_fopen) {
|
||||
fseek((FILE*)what, 0, SEEK_CUR);
|
||||
}
|
||||
#endif
|
||||
@@ -1170,7 +1170,9 @@ PHP_FUNCTION(fwrite)
|
||||
ret = SOCK_WRITEL((*arg2)->value.str.val,num_bytes,socketd);
|
||||
} else {
|
||||
#ifdef HAVE_FLUSHIO
|
||||
fseek((FILE*)what, 0, SEEK_CUR);
|
||||
if (type == le_fopen) {
|
||||
fseek((FILE*)what, 0, SEEK_CUR);
|
||||
}
|
||||
#endif
|
||||
ret = fwrite((*arg2)->value.str.val,1,num_bytes,(FILE*)what);
|
||||
}
|
||||
@@ -1812,7 +1814,9 @@ PHP_FUNCTION(fread)
|
||||
|
||||
if (!issock) {
|
||||
#ifdef HAVE_FLUSHIO
|
||||
fseek((FILE*)what, 0, SEEK_CUR);
|
||||
if (type == le_fopen) {
|
||||
fseek((FILE*)what, 0, SEEK_CUR);
|
||||
}
|
||||
#endif
|
||||
return_value->value.str.len = fread(return_value->value.str.val, 1, len, (FILE*)what);
|
||||
return_value->value.str.val[return_value->value.str.len] = 0;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
| license@php.net so we can mail you a copy immediately. |
|
||||
+----------------------------------------------------------------------+
|
||||
| Authors: Paul Panotzki - Bunyip Information Systems |
|
||||
| Jim Winstead (jimw@php.net) |
|
||||
| Jim Winstead <jimw@php.net> |
|
||||
| Sascha Schumann <sascha@schumann.cx> |
|
||||
+----------------------------------------------------------------------+
|
||||
*/
|
||||
@@ -596,6 +596,7 @@ PHPAPI void php_sockset_timeout(int socket, struct timeval *timeout)
|
||||
SOCK_FIND(sock, socket);
|
||||
|
||||
sock->timeout = *timeout;
|
||||
sock->timeout_event = 0;
|
||||
}
|
||||
|
||||
#define SOCK_FIND_AND_READ_MAX(max) \
|
||||
|
||||
@@ -902,7 +902,7 @@ PHP_FUNCTION(pathinfo)
|
||||
int idx;
|
||||
|
||||
p = strrchr(Z_STRVAL_PP(path), '.');
|
||||
if (*p) {
|
||||
if (p) {
|
||||
idx = p - Z_STRVAL_PP(path);
|
||||
add_assoc_stringl(tmp, "extension", Z_STRVAL_PP(path) + idx + 1, len - idx - 1, 1);
|
||||
}
|
||||
|
||||
@@ -67,12 +67,12 @@ static char *url_attr_addon(const char *tag,const char *attr,const char *val,con
|
||||
if(flag) {
|
||||
if(!strstr(val,buf)&&!strchr(val,':'))
|
||||
{
|
||||
char *result = (char *)emalloc(strlen(buf)+strlen(PG(arg_separator))+1);
|
||||
char *result = (char *)emalloc(strlen(buf)+strlen(PG(arg_separator).output)+1);
|
||||
int n;
|
||||
|
||||
if(strchr(val,'?')) {
|
||||
strcpy(result,PG(arg_separator));
|
||||
n=strlen(PG(arg_separator));
|
||||
strcpy(result,PG(arg_separator).output);
|
||||
n=strlen(PG(arg_separator).output);
|
||||
} else {
|
||||
*result='?';
|
||||
n=1;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Generated by re2c 0.5 on Tue Jan 9 17:13:20 2001 */
|
||||
#line 1 "/home/sas/src/php4/ext/standard/url_scanner_ex.re"
|
||||
/* Generated by re2c 0.5 on Wed Apr 4 19:29:46 2001 */
|
||||
#line 1 "/usr/src/web/php/php4/ext/standard/url_scanner_ex.re"
|
||||
/*
|
||||
+----------------------------------------------------------------------+
|
||||
| PHP version 4.0 |
|
||||
@@ -140,7 +140,7 @@ static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote PLS_DC)
|
||||
|
||||
smart_str_appendc(&ctx->result, quote);
|
||||
if (f) {
|
||||
append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator));
|
||||
append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator).output);
|
||||
} else {
|
||||
smart_str_append(&ctx->result, &ctx->val);
|
||||
}
|
||||
@@ -670,7 +670,7 @@ char *url_adapt_single_url(const char *url, size_t urllen, const char *name, con
|
||||
smart_str_sets(&sname, name);
|
||||
smart_str_sets(&sval, value);
|
||||
|
||||
append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator));
|
||||
append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator).output);
|
||||
|
||||
smart_str_0(&buf);
|
||||
if (newlen) *newlen = buf.len;
|
||||
|
||||
@@ -138,7 +138,7 @@ static inline void tag_arg(url_adapt_state_ex_t *ctx, char quote PLS_DC)
|
||||
|
||||
smart_str_appendc(&ctx->result, quote);
|
||||
if (f) {
|
||||
append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator));
|
||||
append_modified_url(&ctx->val, &ctx->result, &ctx->q_name, &ctx->q_value, PG(arg_separator).output);
|
||||
} else {
|
||||
smart_str_append(&ctx->result, &ctx->val);
|
||||
}
|
||||
@@ -313,7 +313,7 @@ char *url_adapt_single_url(const char *url, size_t urllen, const char *name, con
|
||||
smart_str_sets(&sname, name);
|
||||
smart_str_sets(&sval, value);
|
||||
|
||||
append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator));
|
||||
append_modified_url(&surl, &buf, &sname, &sval, PG(arg_separator).output);
|
||||
|
||||
smart_str_0(&buf);
|
||||
if (newlen) *newlen = buf.len;
|
||||
|
||||
+16
-1
@@ -139,6 +139,18 @@ static void php_disable_functions()
|
||||
}
|
||||
|
||||
|
||||
static PHP_INI_MH(OnUpdateDeprecated)
|
||||
{
|
||||
PLS_FETCH();
|
||||
|
||||
PG(arg_separator.output) = new_value;
|
||||
|
||||
if (stage==PHP_INI_STAGE_RUNTIME) {
|
||||
php_error(E_WARNING, "The arg_separator directive is deprecated. Use arg_separator.output instead");
|
||||
}
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
static PHP_INI_MH(OnUpdateTimeout)
|
||||
{
|
||||
ELS_FETCH();
|
||||
@@ -209,7 +221,10 @@ PHP_INI_BEGIN()
|
||||
STD_PHP_INI_BOOLEAN("track_errors", "0", PHP_INI_ALL, OnUpdateBool, track_errors, php_core_globals, core_globals)
|
||||
STD_PHP_INI_BOOLEAN("y2k_compliance", "0", PHP_INI_ALL, OnUpdateBool, y2k_compliance, php_core_globals, core_globals)
|
||||
|
||||
STD_PHP_INI_ENTRY("arg_separator", "&", PHP_INI_ALL, OnUpdateStringUnempty, arg_separator, php_core_globals, core_globals)
|
||||
STD_PHP_INI_ENTRY("arg_separator.output", "&", PHP_INI_ALL, OnUpdateStringUnempty, arg_separator.output, php_core_globals, core_globals)
|
||||
STD_PHP_INI_ENTRY("arg_separator.input", "&", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, arg_separator.input, php_core_globals, core_globals)
|
||||
PHP_INI_ENTRY("arg_separator", "&", PHP_INI_ALL, OnUpdateDeprecated)
|
||||
|
||||
STD_PHP_INI_ENTRY("auto_append_file", NULL, PHP_INI_ALL, OnUpdateString, auto_append_file, php_core_globals, core_globals)
|
||||
STD_PHP_INI_ENTRY("auto_prepend_file", NULL, PHP_INI_ALL, OnUpdateString, auto_prepend_file, php_core_globals, core_globals)
|
||||
STD_PHP_INI_ENTRY("doc_root", NULL, PHP_INI_SYSTEM, OnUpdateStringUnempty, doc_root, php_core_globals, core_globals)
|
||||
|
||||
+7
-1
@@ -52,6 +52,11 @@ extern ZEND_API struct _php_core_globals core_globals;
|
||||
|
||||
struct _php_tick_function_entry;
|
||||
|
||||
typedef struct _arg_separators {
|
||||
char *output;
|
||||
char *input;
|
||||
} arg_separators;
|
||||
|
||||
struct _php_core_globals {
|
||||
zend_bool magic_quotes_gpc;
|
||||
zend_bool magic_quotes_runtime;
|
||||
@@ -93,7 +98,8 @@ struct _php_core_globals {
|
||||
char *auto_prepend_file;
|
||||
char *auto_append_file;
|
||||
|
||||
char *arg_separator;
|
||||
arg_separators arg_separator;
|
||||
|
||||
char *gpc_order;
|
||||
char *variables_order;
|
||||
|
||||
|
||||
+21
-6
@@ -16,7 +16,7 @@
|
||||
| Zeev Suraski <zeev@zend.com> |
|
||||
+----------------------------------------------------------------------+
|
||||
*/
|
||||
/* $Id: */
|
||||
/* $Id$ */
|
||||
|
||||
#include <stdio.h>
|
||||
#include "php.h"
|
||||
@@ -217,7 +217,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
|
||||
|
||||
void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
|
||||
{
|
||||
char *res = NULL, *var, *val;
|
||||
char *res = NULL, *var, *val, *separator=NULL;
|
||||
const char *c_var;
|
||||
pval *array_ptr;
|
||||
int free_buffer=0;
|
||||
@@ -252,7 +252,7 @@ void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
|
||||
return;
|
||||
}
|
||||
|
||||
if (arg == PARSE_GET) { /* GET data */
|
||||
if (arg == PARSE_GET) { /* GET data */
|
||||
c_var = SG(request_info).query_string;
|
||||
if (c_var && *c_var) {
|
||||
res = (char *) estrdup(c_var);
|
||||
@@ -277,8 +277,18 @@ void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
|
||||
return;
|
||||
}
|
||||
|
||||
var = php_strtok_r(res, ";&", &strtok_buf);
|
||||
|
||||
switch (arg) {
|
||||
case PARSE_GET:
|
||||
case PARSE_STRING:
|
||||
separator = (char *) estrdup(PG(arg_separator).input);
|
||||
break;
|
||||
case PARSE_COOKIE:
|
||||
separator = ";\0";
|
||||
break;
|
||||
}
|
||||
|
||||
var = php_strtok_r(res, separator, &strtok_buf);
|
||||
|
||||
while (var) {
|
||||
val = strchr(var, '=');
|
||||
if (val) { /* have a value */
|
||||
@@ -289,8 +299,13 @@ void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC)
|
||||
val_len = php_url_decode(val, strlen(val));
|
||||
php_register_variable_safe(var, val, val_len, array_ptr ELS_CC PLS_CC);
|
||||
}
|
||||
var = php_strtok_r(NULL, ";&", &strtok_buf);
|
||||
var = php_strtok_r(NULL, separator, &strtok_buf);
|
||||
}
|
||||
|
||||
if(arg != PARSE_COOKIE) {
|
||||
efree(separator);
|
||||
}
|
||||
|
||||
if (free_buffer) {
|
||||
efree(res);
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
/* automatically generated by configure */
|
||||
/* edit configure.in to change version number */
|
||||
#define PHP_VERSION "4.0.5RC6"
|
||||
#define PHP_VERSION "4.0.5"
|
||||
+13
-1
@@ -243,7 +243,12 @@ warn_plus_overloading = Off
|
||||
|
||||
; The separator used in PHP generated URLs to separate arguments.
|
||||
; Default is "&".
|
||||
;arg_separator = "&"
|
||||
;arg_separator.output = "&"
|
||||
|
||||
; List of separator(s) used by PHP to parse input URLs into variables.
|
||||
; Default is "&".
|
||||
; NOTE: Every character in this directive is considered as separator!
|
||||
;arg_separator.input = ";&"
|
||||
|
||||
; This directive describes the order in which PHP registers GET, POST, Cookie,
|
||||
; Environment and Built-in variables (G, P, C, E & S respectively, often
|
||||
@@ -761,3 +766,10 @@ pfpro.defaulttimeout = 30
|
||||
[Sockets]
|
||||
; Use the system read() function instead of the php_read() wrapper.
|
||||
sockets.use_system_read = On
|
||||
|
||||
[com]
|
||||
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
|
||||
;com.typelib_file =
|
||||
|
||||
; allow Distributed-COM calls
|
||||
;com.allow_dcom = true
|
||||
+12
-2
@@ -182,8 +182,14 @@ warn_plus_overloading = Off ; warn if the + operator is used with strings
|
||||
;;;;;;;;;;;;;;;;;
|
||||
; Data Handling ;
|
||||
;;;;;;;;;;;;;;;;;
|
||||
;arg_separator = "&" ; The separator used in PHP generated URLs to separate arguments.
|
||||
; Default is "&".
|
||||
|
||||
;arg_separator.output = "&" ; The separator used in PHP generated URLs to separate arguments.
|
||||
; Default is "&".
|
||||
|
||||
;arg_separator.input = ";&" ; List of separator(s) used by PHP to parse input URLs into variables.
|
||||
; Default is "&".
|
||||
; NOTE: Every character in this directive is considered as separator!
|
||||
|
||||
variables_order = "GPCS" ; This directive describes the order in which PHP registers
|
||||
; GET, POST, Cookie, Environment and Built-in variables (G, P,
|
||||
; C, E & S respectively, often referred to as EGPCS or GPC).
|
||||
@@ -494,6 +500,10 @@ pfpro.defaulttimeout = 30 ; default timeout in seconds
|
||||
[Sockets]
|
||||
sockets.use_system_read = Off ; Use the system read() function instead of
|
||||
; the php_read() wrapper.
|
||||
[com]
|
||||
;com.typelib_file = ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
|
||||
;com.allow_dcom = true ; allow Distributed-COM calls
|
||||
|
||||
; Local Variables:
|
||||
; tab-width: 4
|
||||
; End:
|
||||
+12
-2
@@ -182,8 +182,14 @@ warn_plus_overloading = Off ; warn if the + operator is used with strings
|
||||
;;;;;;;;;;;;;;;;;
|
||||
; Data Handling ;
|
||||
;;;;;;;;;;;;;;;;;
|
||||
;arg_separator = "&" ; The separator used in PHP generated URLs to separate arguments.
|
||||
; Default is "&".
|
||||
|
||||
;arg_separator.output = "&" ; The separator used in PHP generated URLs to separate arguments.
|
||||
; Default is "&".
|
||||
|
||||
;arg_separator.input = ";&" ; List of separator(s) used by PHP to parse input URLs into variables.
|
||||
; Default is "&".
|
||||
; NOTE: Every character in this directive is considered as separator!
|
||||
|
||||
variables_order = "GPCS" ; This directive describes the order in which PHP registers
|
||||
; GET, POST, Cookie, Environment and Built-in variables (G, P,
|
||||
; C, E & S respectively, often referred to as EGPCS or GPC).
|
||||
@@ -494,6 +500,10 @@ pfpro.defaulttimeout = 30 ; default timeout in seconds
|
||||
[Sockets]
|
||||
sockets.use_system_read = Off ; Use the system read() function instead of
|
||||
; the php_read() wrapper.
|
||||
[com]
|
||||
;com.typelib_file = ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
|
||||
;com.allow_dcom = true ; allow Distributed-COM calls
|
||||
|
||||
; Local Variables:
|
||||
; tab-width: 4
|
||||
; End:
|
||||
@@ -231,7 +231,7 @@ AP_MODULE_DECLARE_DATA module php4_module;
|
||||
}
|
||||
|
||||
static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
|
||||
ap_input_mode_t mode)
|
||||
ap_input_mode_t mode, apr_size_t *readbytes)
|
||||
{
|
||||
php_struct *ctx;
|
||||
long old_index;
|
||||
@@ -245,7 +245,7 @@ static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
|
||||
|
||||
INIT_CTX;
|
||||
|
||||
if ((rv = ap_get_brigade(f->next, bb, mode)) != APR_SUCCESS) {
|
||||
if ((rv = ap_get_brigade(f->next, bb, mode, readbytes)) != APR_SUCCESS) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
+15
-19
@@ -24,6 +24,8 @@
|
||||
#include "php_variables.h"
|
||||
#include "version.h"
|
||||
|
||||
#include "ext/standard/php_smart_str.h"
|
||||
|
||||
#include <sys/uio.h>
|
||||
|
||||
typedef struct {
|
||||
@@ -57,7 +59,7 @@ static int sapi_thttpd_ub_write(const char *str, uint str_length)
|
||||
if (n <= 0)
|
||||
return n;
|
||||
|
||||
TG(hc)->bytes += n;
|
||||
TG(hc)->bytes_sent += n;
|
||||
str += n;
|
||||
sent += n;
|
||||
str_length -= n;
|
||||
@@ -84,7 +86,7 @@ static int sapi_thttpd_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
|
||||
vec[n].iov_base = buf;
|
||||
vec[n++].iov_len = len;
|
||||
TG(hc)->status = SG(sapi_headers).http_response_code;
|
||||
TG(hc)->bytes += len;
|
||||
TG(hc)->bytes_sent += len;
|
||||
}
|
||||
|
||||
h = zend_llist_get_first_ex(&sapi_headers->headers, &pos);
|
||||
@@ -257,30 +259,24 @@ static void thttpd_module_main(TLS_D SLS_DC)
|
||||
|
||||
static void thttpd_request_ctor(TLS_D SLS_DC)
|
||||
{
|
||||
char *cp;
|
||||
size_t cp_len;
|
||||
char buf[1024];
|
||||
int offset;
|
||||
size_t filename_len;
|
||||
size_t cwd_len;
|
||||
|
||||
smart_str s = {0};
|
||||
|
||||
SG(request_info).query_string = TG(hc)->query?strdup(TG(hc)->query):NULL;
|
||||
|
||||
filename_len = strlen(TG(hc)->expnfilename);
|
||||
cwd_len = strlen(TG(hc)->hs->cwd);
|
||||
|
||||
cp_len = cwd_len + filename_len;
|
||||
cp = (char *) malloc(cp_len + 1);
|
||||
/* cwd always ends in "/", so this is safe */
|
||||
memcpy(cp, TG(hc)->hs->cwd, cwd_len);
|
||||
memcpy(cp + cwd_len, TG(hc)->expnfilename, filename_len);
|
||||
cp[cp_len] = '\0';
|
||||
smart_str_appends_ex(&s, TG(hc)->hs->cwd, 1);
|
||||
smart_str_appends_ex(&s, TG(hc)->expnfilename, 1);
|
||||
smart_str_0(&s);
|
||||
SG(request_info).path_translated = s.c;
|
||||
|
||||
SG(request_info).path_translated = cp;
|
||||
|
||||
snprintf(buf, 1023, "/%s", TG(hc)->origfilename);
|
||||
SG(request_info).request_uri = strdup(buf);
|
||||
s.c = NULL;
|
||||
smart_str_appendc_ex(&s, '/', 1);
|
||||
smart_str_appends_ex(&s, TG(hc)->origfilename, 1);
|
||||
smart_str_0(&s);
|
||||
SG(request_info).request_uri = s.c;
|
||||
SG(request_info).request_method = httpd_method_str(TG(hc)->method);
|
||||
SG(sapi_headers).http_response_code = 200;
|
||||
SG(request_info).content_type = TG(hc)->contenttype;
|
||||
@@ -313,7 +309,7 @@ off_t thttpd_php_request(httpd_conn *hc)
|
||||
TLS_FETCH();
|
||||
|
||||
TG(hc) = hc;
|
||||
hc->bytes = 0;
|
||||
hc->bytes_sent = 0;
|
||||
|
||||
thttpd_request_ctor(TLS_C SLS_CC);
|
||||
|
||||
|
||||
+31
-30
@@ -1,6 +1,6 @@
|
||||
diff -Nur thttpd-2.20b/Makefile.in thttpd-2.20b-php/Makefile.in
|
||||
--- thttpd-2.20b/Makefile.in Tue Jul 4 18:21:32 2000
|
||||
+++ thttpd-2.20b-php/Makefile.in Mon Nov 13 14:25:48 2000
|
||||
diff -ur thttpd-2.21/Makefile.in thttpd-2.21-p/Makefile.in
|
||||
--- thttpd-2.21/Makefile.in Thu Mar 29 20:36:21 2001
|
||||
+++ thttpd-2.21-p/Makefile.in Sun Apr 22 15:59:42 2001
|
||||
@@ -46,13 +46,15 @@
|
||||
|
||||
# You shouldn't need to edit anything below here.
|
||||
@@ -38,10 +38,10 @@ diff -Nur thttpd-2.20b/Makefile.in thttpd-2.20b-php/Makefile.in
|
||||
|
||||
tar:
|
||||
@name=`sed -n -e '/SERVER_SOFTWARE/!d' -e 's,.*thttpd/,thttpd-,' -e 's, .*,,p' version.h` ; \
|
||||
diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
|
||||
--- thttpd-2.20b/libhttpd.c Wed Sep 27 20:13:24 2000
|
||||
+++ thttpd-2.20b-php/libhttpd.c Mon Nov 13 14:25:57 2000
|
||||
@@ -75,6 +75,8 @@
|
||||
diff -ur thttpd-2.21/libhttpd.c thttpd-2.21-p/libhttpd.c
|
||||
--- thttpd-2.21/libhttpd.c Sat Apr 21 02:11:32 2001
|
||||
+++ thttpd-2.21-p/libhttpd.c Sun Apr 22 16:01:41 2001
|
||||
@@ -85,6 +85,8 @@
|
||||
#include "match.h"
|
||||
#include "tdate_parse.h"
|
||||
|
||||
@@ -50,7 +50,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
|
||||
#ifndef STDIN_FILENO
|
||||
#define STDIN_FILENO 0
|
||||
#endif
|
||||
@@ -225,6 +227,8 @@
|
||||
@@ -243,6 +245,8 @@
|
||||
free( (void*) hs->cwd );
|
||||
if ( hs->cgi_pattern != (char*) 0 )
|
||||
free( (void*) hs->cgi_pattern );
|
||||
@@ -59,7 +59,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
|
||||
if ( hs->charset != (char*) 0 )
|
||||
free( (void*) hs->charset );
|
||||
if ( hs->url_pattern != (char*) 0 )
|
||||
@@ -232,6 +236,7 @@
|
||||
@@ -250,6 +254,7 @@
|
||||
if ( hs->local_pattern != (char*) 0 )
|
||||
free( (void*) hs->local_pattern );
|
||||
free( (void*) hs );
|
||||
@@ -67,7 +67,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
|
||||
}
|
||||
|
||||
|
||||
@@ -292,6 +297,7 @@
|
||||
@@ -313,6 +318,7 @@
|
||||
}
|
||||
|
||||
hs->port = port;
|
||||
@@ -75,7 +75,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
|
||||
if ( cgi_pattern == (char*) 0 )
|
||||
hs->cgi_pattern = (char*) 0;
|
||||
else
|
||||
@@ -363,6 +369,8 @@
|
||||
@@ -386,6 +392,8 @@
|
||||
return (httpd_server*) 0;
|
||||
}
|
||||
|
||||
@@ -83,19 +83,20 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
|
||||
+
|
||||
/* Done initializing. */
|
||||
if ( hs->binding_hostname == (char*) 0 )
|
||||
syslog( LOG_INFO, "%s starting on port %d", SERVER_SOFTWARE, hs->port );
|
||||
@@ -2167,7 +2175,9 @@
|
||||
void
|
||||
httpd_close_conn( httpd_conn* hc, struct timeval* nowP )
|
||||
syslog( LOG_INFO, "%.80s starting on port %d", SERVER_SOFTWARE, hs->port );
|
||||
@@ -2336,7 +2344,10 @@
|
||||
{
|
||||
make_log_entry( hc, nowP );
|
||||
|
||||
- if ( hc->file_address != (char*) 0 )
|
||||
+ if (hc->file_address == (char *) 1) {
|
||||
+ thttpd_closed_conn(hc->conn_fd);
|
||||
+ } else if ( hc->file_address != (char*) 0 )
|
||||
+ if ( hc->file_address == (char*) 1 )
|
||||
+ {
|
||||
+ thttpd_closed_conn(hc->conn_fd);
|
||||
+ } else if ( hc->file_address != (char*) 0 )
|
||||
{
|
||||
mmc_unmap( hc->file_address, nowP, &(hc->sb) );
|
||||
mmc_unmap( hc->file_address, &(hc->sb), nowP );
|
||||
hc->file_address = (char*) 0;
|
||||
@@ -3336,6 +3346,11 @@
|
||||
@@ -3543,6 +3554,11 @@
|
||||
( hc->sb.st_mode & S_IXOTH ) &&
|
||||
match( hc->hs->cgi_pattern, hc->expnfilename ) )
|
||||
return cgi( hc );
|
||||
@@ -107,9 +108,9 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
|
||||
|
||||
/* It's not CGI. If it's executable or there's pathinfo, someone's
|
||||
** trying to either serve or run a non-CGI file as CGI. Either case
|
||||
diff -Nur thttpd-2.20b/libhttpd.h thttpd-2.20b-php/libhttpd.h
|
||||
--- thttpd-2.20b/libhttpd.h Tue Jun 13 20:48:56 2000
|
||||
+++ thttpd-2.20b-php/libhttpd.h Mon Nov 13 14:25:48 2000
|
||||
diff -ur thttpd-2.21/libhttpd.h thttpd-2.21-p/libhttpd.h
|
||||
--- thttpd-2.21/libhttpd.h Fri Apr 13 07:37:17 2001
|
||||
+++ thttpd-2.21-p/libhttpd.h Sun Apr 22 15:59:42 2001
|
||||
@@ -69,6 +69,7 @@
|
||||
char* server_hostname;
|
||||
int port;
|
||||
@@ -118,19 +119,19 @@ diff -Nur thttpd-2.20b/libhttpd.h thttpd-2.20b-php/libhttpd.h
|
||||
char* charset;
|
||||
char* cwd;
|
||||
int listen4_fd, listen6_fd;
|
||||
diff -Nur thttpd-2.20b/thttpd.c thttpd-2.20b-php/thttpd.c
|
||||
--- thttpd-2.20b/thttpd.c Wed Sep 27 21:31:48 2000
|
||||
+++ thttpd-2.20b-php/thttpd.c Mon Nov 13 14:25:57 2000
|
||||
@@ -1332,6 +1333,12 @@
|
||||
c->bytes_sent = hc->bytes;
|
||||
diff -ur thttpd-2.21/thttpd.c thttpd-2.21-p/thttpd.c
|
||||
--- thttpd-2.21/thttpd.c Sun Apr 15 18:09:20 2001
|
||||
+++ thttpd-2.21-p/thttpd.c Sun Apr 22 15:59:42 2001
|
||||
@@ -1392,6 +1392,12 @@
|
||||
clear_connection( c, tvP );
|
||||
return;
|
||||
+ }
|
||||
}
|
||||
+ if (hc->file_address == (char *) 1) {
|
||||
+ tmr_cancel( c->idle_read_timer );
|
||||
+ c->idle_read_timer = (Timer*) 0;
|
||||
+ c->wouldblock_delay = 0;
|
||||
+ return;
|
||||
}
|
||||
+ }
|
||||
if ( c->bytes_sent >= c->bytes_to_send )
|
||||
{
|
||||
/* There's nothing to send. */
|
||||
@@ -1899,6 +1899,10 @@ SOURCE=..\win32\wsyslog.c
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\ext\com\com.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\ext\com\conversion.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
Reference in new issue
Block a user