date:20091008

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/session/ mod_mm.c

2009-10-08 Thread Jani Taskinen

jani Thu, 08 Oct 2009 10:33:26 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289338

Log:
- Fixed bug #49503 (invalid warning for failed semaphore file creation)
# I have no idea why I had added this. Might have been some debug code.. :(

Bug: http://bugs.php.net/49503 (Assigned) "failed to open semaphore file"
  
Changed paths:
U   php/php-src/branches/PHP_5_2/ext/session/mod_mm.c

Modified: php/php-src/branches/PHP_5_2/ext/session/mod_mm.c
===
--- php/php-src/branches/PHP_5_2/ext/session/mod_mm.c   2009-10-08 10:02:44 UTC 
(rev 289337)
+++ php/php-src/branches/PHP_5_2/ext/session/mod_mm.c   2009-10-08 10:33:26 UTC 
(rev 289338)
@@ -219,9 +219,6 @@
data->owner = getpid();
data->mm = mm_create(0, path);
if (!data->mm) {
-   TSRMLS_FETCH();
-
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "mm_create(0, %s) 
failed, err %s", path, mm_error());
return FAILURE;
}


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/session/ mod_mm.c

2009-10-08 Thread Hannes Magnusson

On Thu, Oct 8, 2009 at 12:33, Jani Taskinen  wrote:
> jani                                     Thu, 08 Oct 2009 10:33:26 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=289338
>
> Log:
> - Fixed bug #49503 (invalid warning for failed semaphore file creation)
> # I have no idea why I had added this. Might have been some debug code.. :(

This doesn't solve his problem though. That module never get
initialized properly so it simply fallsbacks to plain files.
All you are doing now is removing the warning about the fact it will
use the fallback.

-Hannes

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd.c

2009-10-08 Thread Ulf Wendel

uw   Thu, 08 Oct 2009 11:40:16 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289339

Log:
Fixing pconnect statistics.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2009-10-08 10:33:26 UTC 
(rev 289338)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2009-10-08 11:40:16 UTC 
(rev 289339)
@@ -772,13 +772,12 @@

(char *)&buf_size TSRMLS_CC);
}

-   MYSQLND_INC_CONN_STATISTIC(&conn->stats, STAT_CONNECT_SUCCESS);
+   MYSQLND_INC_CONN_STATISTIC_W_VALUE2(&conn->stats, 
STAT_CONNECT_SUCCESS, 1, STAT_OPENED_CONNECTIONS, 1);
if (reconnect) {
MYSQLND_INC_GLOBAL_STATISTIC(STAT_RECONNECT);
}
-   MYSQLND_INC_CONN_STATISTIC(&conn->stats, 
STAT_OPENED_CONNECTIONS);
if (conn->persistent) {
-   MYSQLND_INC_CONN_STATISTIC(&conn->stats, 
STAT_OPENED_PERSISTENT_CONNECTIONS);
+   MYSQLND_INC_CONN_STATISTIC_W_VALUE2(&conn->stats, 
STAT_PCONNECT_SUCCESS, 1, STAT_OPENED_PERSISTENT_CONNECTIONS, 1);
}

DBG_INF_FMT("connection_id=%llu", conn->thread_id);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-10-08 10:33:26 UTC (rev 
289338)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-10-08 11:40:16 UTC (rev 
289339)
@@ -772,13 +772,12 @@

(char *)&buf_size TSRMLS_CC);
}

-   MYSQLND_INC_CONN_STATISTIC(&conn->stats, STAT_CONNECT_SUCCESS);
+   MYSQLND_INC_CONN_STATISTIC_W_VALUE2(&conn->stats, 
STAT_CONNECT_SUCCESS, 1, STAT_OPENED_CONNECTIONS, 1);
if (reconnect) {
MYSQLND_INC_GLOBAL_STATISTIC(STAT_RECONNECT);
}
-   MYSQLND_INC_CONN_STATISTIC(&conn->stats, 
STAT_OPENED_CONNECTIONS);
if (conn->persistent) {
-   MYSQLND_INC_CONN_STATISTIC(&conn->stats, 
STAT_OPENED_PERSISTENT_CONNECTIONS);
+   MYSQLND_INC_CONN_STATISTIC_W_VALUE2(&conn->stats, 
STAT_PCONNECT_SUCCESS, 1, STAT_OPENED_PERSISTENT_CONNECTIONS, 1);
}

DBG_INF_FMT("connection_id=%llu", conn->thread_id);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/configure.in branches/PHP_5_3/NEWS branches/PHP_5_3/configure.in trunk/configure.in

2009-10-08 Thread Jani Taskinen

jani Thu, 08 Oct 2009 14:21:53 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289341

Log:
- Fixed bug #49809 (time_sleep_until is not available on solaris)

Bug: http://bugs.php.net/49809 (Assigned) time_sleep_until is not available on 
solaris
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/configure.in
U   php/php-src/trunk/configure.in

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-10-08 13:46:09 UTC (rev 289340)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-10-08 14:21:53 UTC (rev 289341)
@@ -6,6 +6,7 @@
 - Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz
   Stachowiak.  (Rasmus)

+- Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
 - Fixed bug #49757 (long2ip() can return wrong value in a multi-threaded
   applications). (Ilia, Florian Anderiasch)
 - Fixed bug #49738 (calling mcrypt() after mcrypt_generic_deinit() crashes).

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2009-10-08 13:46:09 UTC (rev 
289340)
+++ php/php-src/branches/PHP_5_2/configure.in   2009-10-08 14:21:53 UTC (rev 
289341)
@@ -366,6 +366,8 @@
 PHP_CHECK_FUNC(inet_aton, resolv, bind)
 PHP_CHECK_FUNC(dn_skipname, resolv, bind)

+dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+PHP_CHECK_FUNC(nanosleep, rt)

 dnl Then headers.
 dnl -
@@ -594,7 +596,6 @@
 unlockpt \
 unsetenv \
 usleep \
-nanosleep \
 utime \
 vsnprintf \
 )

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-10-08 13:46:09 UTC (rev 289340)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-10-08 14:21:53 UTC (rev 289341)
@@ -13,6 +13,7 @@
 - Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz
   Stachowiak.  (Rasmus)

+- Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
 - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
   (Ilia, wmeler at wp-sa dot pl)
 - Fixed bug #49757 (long2ip() can return wrong value in a multi-threaded

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2009-10-08 13:46:09 UTC (rev 
289340)
+++ php/php-src/branches/PHP_5_3/configure.in   2009-10-08 14:21:53 UTC (rev 
289341)
@@ -402,6 +402,8 @@
 dnl in -lc, -lbind and -lresolv
 PHP_CHECK_FUNC(inet_aton, resolv, bind)

+dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+PHP_CHECK_FUNC(nanosleep, rt)

 dnl Then headers.
 dnl -
@@ -621,7 +623,6 @@
 unlockpt \
 unsetenv \
 usleep \
-nanosleep \
 utime \
 vsnprintf \
 vasprintf \

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2009-10-08 13:46:09 UTC (rev 289340)
+++ php/php-src/trunk/configure.in  2009-10-08 14:21:53 UTC (rev 289341)
@@ -402,6 +402,8 @@
 dnl in -lc, -lbind and -lresolv
 PHP_CHECK_FUNC(inet_aton, resolv, bind)

+dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+PHP_CHECK_FUNC(nanosleep, rt)

 dnl Then headers.
 dnl -
@@ -621,7 +623,6 @@
 unlockpt \
 unsetenv \
 usleep \
-nanosleep \
 utime \
 vsnprintf \
 vasprintf \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2009-10-08 Thread Derick Rethans

derick   Thu, 08 Oct 2009 15:54:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289349

Log:
- Giving Felipe GTK karma because Elizabeth is constantly nagging me about it.

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2009-10-08 15:38:13 UTC (rev 289348)
+++ SVNROOT/global_avail2009-10-08 15:54:13 UTC (rev 289349)
@@ -103,7 +103,7 @@

 # The PHP-GTK Group has access to the PHP-GTK code and documentation.

-avail|fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick|gtk/php-gtk,gtk/php-gtk-doc
+avail|fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak,akshat,derick,felipe|gtk/php-gtk,gtk/php-gtk-doc

 # The PHP-GTK Documentation Group has access to the PHP-GTK
 # documentation.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd.c

2009-10-08 Thread Ulf Wendel

uw   Thu, 08 Oct 2009 16:33:17 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289351

Log:
Avoid buffer resizing and let the initial buffer allocation happen a couple of 
lines later with conn->m->set_client_option(conn, 
MYSQLND_OPT_NET_CMD_BUFFER_SIZE, ...). Andrey, I leave it to you to change the 
default size to 128k.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2009-10-08 16:30:16 UTC 
(rev 289350)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2009-10-08 16:33:17 UTC 
(rev 289351)
@@ -757,8 +757,6 @@
SET_EMPTY_ERROR(conn->error_info);

conn->zval_cache = 
mysqlnd_palloc_get_thd_cache_reference(zval_cache);
-   conn->net.cmd_buffer.length = 128L*1024L;
-   conn->net.cmd_buffer.buffer = 
mnd_pemalloc(conn->net.cmd_buffer.length, conn->persistent);

mysqlnd_local_infile_default(conn);
{

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-10-08 16:30:16 UTC (rev 
289350)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-10-08 16:33:17 UTC (rev 
289351)
@@ -757,8 +757,6 @@
SET_EMPTY_ERROR(conn->error_info);

conn->zval_cache = 
mysqlnd_palloc_get_thd_cache_reference(zval_cache);
-   conn->net.cmd_buffer.length = 128L*1024L;
-   conn->net.cmd_buffer.buffer = 
mnd_pemalloc(conn->net.cmd_buffer.length, conn->persistent);

mysqlnd_local_infile_default(conn);
{

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/enchant/enchant.c trunk/ext/enchant/enchant.c

2009-10-08 Thread Pierre-Alain Joye

pajoye   Thu, 08 Oct 2009 20:40:48 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289368

Log:
- typo

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
U   php/php-src/trunk/ext/enchant/enchant.c

Modified: php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
===
--- php/php-src/branches/PHP_5_3/ext/enchant/enchant.c  2009-10-08 20:39:50 UTC 
(rev 289367)
+++ php/php-src/branches/PHP_5_3/ext/enchant/enchant.c  2009-10-08 20:40:48 UTC 
(rev 289368)
@@ -290,7 +290,7 @@
le_enchant_broker = 
zend_register_list_destructors_ex(php_enchant_broker_free, NULL, 
"enchant_broker", module_number);
le_enchant_dict = 
zend_register_list_destructors_ex(php_enchant_dict_free, NULL, "enchant_dict", 
module_number);
REGISTER_LONG_CONSTANT("ENCHANT_MYSPELL", PHP_ENCHANT_MYSPELL, CONST_CS 
| CONST_PERSISTENT);
-   REGISTER_LONG_CONSTANT("ENCHAT_ISPELL", PHP_ENCHANT_ISPELL, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("ENCHANT_ISPELL", PHP_ENCHANT_ISPELL, CONST_CS | 
CONST_PERSISTENT);
return SUCCESS;
 }
 /* }}} */

Modified: php/php-src/trunk/ext/enchant/enchant.c
===
--- php/php-src/trunk/ext/enchant/enchant.c 2009-10-08 20:39:50 UTC (rev 
289367)
+++ php/php-src/trunk/ext/enchant/enchant.c 2009-10-08 20:40:48 UTC (rev 
289368)
@@ -290,7 +290,7 @@
le_enchant_broker = 
zend_register_list_destructors_ex(php_enchant_broker_free, NULL, 
"enchant_broker", module_number);
le_enchant_dict = 
zend_register_list_destructors_ex(php_enchant_dict_free, NULL, "enchant_dict", 
module_number);
REGISTER_LONG_CONSTANT("ENCHANT_MYSPELL", PHP_ENCHANT_MYSPELL, CONST_CS 
| CONST_PERSISTENT);
-   REGISTER_LONG_CONSTANT("ENCHAT_ISPELL", PHP_ENCHANT_ISPELL, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("ENCHANT_ISPELL", PHP_ENCHANT_ISPELL, CONST_CS | 
CONST_PERSISTENT);
return SUCCESS;
 }
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/enchant/ config.w32

2009-10-08 Thread Pierre-Alain Joye

pajoye   Thu, 08 Oct 2009 20:59:50 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289372

Log:
- missing define

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/enchant/config.w32

Modified: php/php-src/branches/PHP_5_3/ext/enchant/config.w32
===
--- php/php-src/branches/PHP_5_3/ext/enchant/config.w32 2009-10-08 20:58:38 UTC 
(rev 289371)
+++ php/php-src/branches/PHP_5_3/ext/enchant/config.w32 2009-10-08 20:59:50 UTC 
(rev 289372)
@@ -9,6 +9,7 @@
CHECK_LIB("libenchant.lib", "enchant", PHP_ENCHANT) ) {
EXTENSION("enchant", "enchant.c");
AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+   AC_DEFINE('HAVE_ENCHANT_BROKER_SET_PARAM', 1);
ADD_FLAG("CFLAG_ENCHANT", "/D _WIN32");
} else {
WARNING('Could not find enchant.h; skipping');

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

2009-10-08 Thread Ilia Alshanetsky

iliaaFri, 09 Oct 2009 02:15:22 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289394

Log:
Syntax

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-10-09 02:10:53 UTC (rev 289393)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-10-09 02:15:22 UTC (rev 289394)
@@ -28,7 +28,7 @@
 - Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrongly converted).
   (Moriyoshi)
 - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia)
-- Fixed bug #48764 (PDO_pgsql::query always uses implicit prepared statements
+- Fixed bug #48764 (PDO_pgsql::query() always uses implicit prepared statements
   if v3 proto available). (Matteo, Mark Kirkwood)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/enchant/config.m4 branches/PHP_5_3/ext/enchant/docs/examples/example1.php branches/PHP_5_3/ext/enchant/enchant.c branches/PHP_5_3/ext/enchant/php_ench

2009-10-08 Thread Pierre-Alain Joye

pajoye   Thu, 08 Oct 2009 20:28:21 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289366

Log:
- [DOC] add enchant_broket_set_dict_path and enchant_broker_get_dict_path
 - add constants ENCHANT_MYSPELL and ENCHANT_ISPELL

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/enchant/config.m4
U   php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
U   php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
U   php/php-src/branches/PHP_5_3/ext/enchant/php_enchant.h
U   php/php-src/trunk/ext/enchant/config.m4
U   php/php-src/trunk/ext/enchant/config.w32
U   php/php-src/trunk/ext/enchant/docs/examples/example1.php
U   php/php-src/trunk/ext/enchant/enchant.c
U   php/php-src/trunk/ext/enchant/php_enchant.h

Modified: php/php-src/branches/PHP_5_3/ext/enchant/config.m4
===
--- php/php-src/branches/PHP_5_3/ext/enchant/config.m4	2009-10-08 20:10:51 UTC (rev 289365)
+++ php/php-src/branches/PHP_5_3/ext/enchant/config.m4	2009-10-08 20:28:21 UTC (rev 289366)
@@ -33,4 +33,10 @@
 	PHP_SUBST(ENCHANT_SHARED_LIBADD)
 	PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
 	PHP_ADD_INCLUDE($ENCHANT_INCDIR)
+	PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
+	[
+	  AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
+	  AC_DEFINE(ENCHANT_VERSION_STRING, "1.5.x", [ ])
+	], [], [ -L$ENCHANT_LIB $ENCHANT_SHARED_LIBADD])
+
 fi

Modified: php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php
===
--- php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php	2009-10-08 20:10:51 UTC (rev 289365)
+++ php/php-src/branches/PHP_5_3/ext/enchant/docs/examples/example1.php	2009-10-08 20:28:21 UTC (rev 289366)
@@ -13,7 +13,7 @@
 	$spellerrors = enchant_dict_check($d, "soong");
 	print_r($dprovides);
 	echo "found $spellerrors spell errors\n";
-	if (!$spellerrors) {
+	if (spellerrors) {
 		$suggs = enchant_dict_suggest($d, "soong");
 		echo "Suggestions for 'soong':";
 		print_r($suggs);

Modified: php/php-src/branches/PHP_5_3/ext/enchant/enchant.c
===
--- php/php-src/branches/PHP_5_3/ext/enchant/enchant.c	2009-10-08 20:10:51 UTC (rev 289365)
+++ php/php-src/branches/PHP_5_3/ext/enchant/enchant.c	2009-10-08 20:28:21 UTC (rev 289366)
@@ -22,17 +22,13 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#ifdef PHP_WIN32
-#include 
-#include 
-#endif
+
 #include 
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_enchant.h"

-
 typedef EnchantBroker * EnchantBrokerPtr;
 typedef struct _broker_struct enchant_broker;
 typedef struct _dict_struct enchant_dict;
@@ -64,6 +60,9 @@
 /* If you declare any globals in php_enchant.h uncomment this:*/
 /*ZEND_DECLARE_MODULE_GLOBALS(enchant)*/

+#define PHP_ENCHANT_MYSPELL 1
+#define PHP_ENCHANT_ISPELL 2
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO(arginfo_enchant_broker_init, 0)
 ZEND_END_ARG_INFO()
@@ -72,6 +71,17 @@
 	ZEND_ARG_INFO(0, broker)
 ZEND_END_ARG_INFO()

+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_set_dict_path, 0, 0, 3)
+	ZEND_ARG_INFO(0, broker)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_get_dict_path, 0, 0, 2)
+	ZEND_ARG_INFO(0, broker)
+	ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_enchant_broker_request_dict, 0, 0, 2)
 	ZEND_ARG_INFO(0, broker)
 	ZEND_ARG_INFO(0, tag)
@@ -118,6 +128,8 @@
 	PHP_FE(enchant_broker_init, 			arginfo_enchant_broker_init)
 	PHP_FE(enchant_broker_free, 			arginfo_enchant_broker_free)
 	PHP_FE(enchant_broker_get_error, 		arginfo_enchant_broker_free)
+	PHP_FE(enchant_broker_set_dict_path,	arginfo_enchant_broker_set_dict_path)
+	PHP_FE(enchant_broker_get_dict_path,	arginfo_enchant_broker_get_dict_path)
 	PHP_FE(enchant_broker_list_dicts, 		arginfo_enchant_broker_free)
 	PHP_FE(enchant_broker_request_dict,		arginfo_enchant_broker_request_dict)
 	PHP_FE(enchant_broker_request_pwl_dict, arginfo_enchant_broker_request_pwl_dict)
@@ -277,7 +289,8 @@
 {
 	le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, "enchant_broker", module_number);
 	le_enchant_dict = zend_register_list_destructors_ex(php_enchant_dict_free, NULL, "enchant_dict", module_number);
-
+	REGISTER_LONG_CONSTANT("ENCHANT_MYSPELL", PHP_ENCHANT_MYSPELL, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ENCHAT_ISPELL", PHP_ENCHANT_ISPELL, CONST_CS | CONST_PERSISTENT);
 	return SUCCESS;
 }
 /* }}} */
@@ -309,6 +322,11 @@
 	php_info_print_table_start();
 	php_info_print_table_header(2, "enchant support", "enabled");
 	php_info_print_table_row(2, "Version", PHP_ENCHANT_VERSION);
+#ifdef ENCHANT_VERSION_STRING
+	php_info_print_table_row(2, "Libenchant Version", ENCHANT_VERSION_S

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/session/ mod_mm.c

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/session/ mod_mm.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/configure.in branches/PHP_5_3/NEWS branches/PHP_5_3/configure.in trunk/configure.in

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/enchant/enchant.c trunk/ext/enchant/enchant.c

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/enchant/ config.w32

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/enchant/config.m4 branches/PHP_5_3/ext/enchant/docs/examples/example1.php branches/PHP_5_3/ext/enchant/enchant.c branches/PHP_5_3/ext/enchant/php_ench

10 matches

Site Navigation

Mail list logo

Footer information