date:20080805

[PHP-CVS] cvs: php-src / NEWS

2008-08-05 Thread Jani Taskinen

janiWed Aug  6 05:51:39 2008 UTC

  Modified files:  
/php-srcNEWS 
  Log:
  - Old news
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2164&r2=1.2165&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2164 php-src/NEWS:1.2165
--- php-src/NEWS:1.2164 Mon Jul 14 10:06:21 2008
+++ php-src/NEWSWed Aug  6 05:51:38 2008
@@ -48,6 +48,5 @@
   . stream_resolve_include_path(). (Sara)
 - Added shm_has_var() function. (Mike)
 - Added str_getcsv() function. (Sara)
-- Added ext/hash support to ext/session's ID generator. (Sara)
 
 - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike)



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

[PHP-CVS] cvs: php-src /ext/session session.c /ext/session/tests session_decode_variation3.phpt session_encode_variation3.phpt session_encode_variation4.phpt session_encode_variation5.phpt session_en

2008-08-05 Thread Jani Taskinen

janiWed Aug  6 05:34:55 2008 UTC

  Modified files:  
/php-src/ext/sessionsession.c 
/php-src/ext/session/tests  session_decode_variation3.phpt 
session_encode_variation3.phpt 
session_encode_variation4.phpt 
session_encode_variation5.phpt 
session_encode_variation7.phpt 
session_encode_variation8.phpt 
  Log:
  - Fixed some inconsistencies with the behaviour of sessions. Changed 
session_start() to return false when session start fails.
  http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.491&r2=1.492&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.491 php-src/ext/session/session.c:1.492
--- php-src/ext/session/session.c:1.491 Wed Aug  6 04:48:39 2008
+++ php-src/ext/session/session.c   Wed Aug  6 05:34:55 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.491 2008/08/06 04:48:39 jani Exp $ */
+/* $Id: session.c,v 1.492 2008/08/06 05:34:55 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -508,7 +508,10 @@
err_type = E_ERROR;
}
 
-   php_error_docref(NULL TSRMLS_CC, err_type, "Cannot find save 
handler %s", new_value);
+   /* Do not output error when restoring ini options. */
+   if (stage != ZEND_INI_STAGE_DEACTIVATE) {
+   php_error_docref(NULL TSRMLS_CC, err_type, "Cannot find 
save handler '%s'", new_value);
+   }
return FAILURE;
}
PS(mod) = tmp;
@@ -517,20 +520,6 @@
 }
 /* }}} */
 
-static PHP_INI_MH(OnUpdateTransSid) /* {{{ */
-{
-   SESSION_CHECK_ACTIVE_STATE;
-
-   if (!strncasecmp(new_value, "on", sizeof("on"))) {
-   PS(use_trans_sid) = (zend_bool) 1;
-   } else {
-   PS(use_trans_sid) = (zend_bool) atoi(new_value);
-   }
-
-   return SUCCESS;
-}
-/* }}} */
-
 static PHP_INI_MH(OnUpdateSerializer) /* {{{ */
 {
const ps_serializer *tmp;
@@ -547,7 +536,10 @@
err_type = E_ERROR;
}
 
-   php_error_docref(NULL TSRMLS_CC, err_type, "Cannot find 
serialization handler '%s'", new_value);
+   /* Do not output error when restoring ini options. */
+   if (stage != ZEND_INI_STAGE_DEACTIVATE) {
+   php_error_docref(NULL TSRMLS_CC, err_type, "Cannot find 
serialization handler '%s'", new_value);
+   }
return FAILURE;
}
PS(serializer) = tmp;
@@ -556,6 +548,20 @@
 }
 /* }}} */
 
+static PHP_INI_MH(OnUpdateTransSid) /* {{{ */
+{
+   SESSION_CHECK_ACTIVE_STATE;
+
+   if (!strncasecmp(new_value, "on", sizeof("on"))) {
+   PS(use_trans_sid) = (zend_bool) 1;
+   } else {
+   PS(use_trans_sid) = (zend_bool) atoi(new_value);
+   }
+
+   return SUCCESS;
+}
+/* }}} */
+
 static PHP_INI_MH(OnUpdateSaveDir) /* {{{ */
 {
/* Only do the safemode/open_basedir check at runtime */
@@ -1236,30 +1242,42 @@
 {
zval **ppid;
zval **data;
-   char *p;
+   char *p, *value;
int nrand;
int lensess;
 
PS(apply_trans_sid) = PS(use_trans_sid);
 
-   if (PS(session_status) != php_session_none) {
-   if (PS(session_status) == php_session_disabled) {
-   char *value;
+   switch (PS(session_status)) {
+   case php_session_active:
+   php_error(E_NOTICE, "A session had already been started 
- ignoring session_start()");
+   return;
+   break;
 
+   case php_session_disabled:
value = zend_ini_string("session.save_handler", 
sizeof("session.save_handler"), 0);
-
-   if (value) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Cannot find save handler %s", value);
-   } else {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Cannot find unknown save handler");
+   if (!PS(mod) && value) {
+   PS(mod) = _php_find_ps_module(value TSRMLS_CC);
+   if (!PS(mod)) {
+   php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "Cannot find save handler '%s' - session startup failed", value);
+   return;
+   }
}
-   return;
-   }
-   php_error(E_NOTICE, "A session had already been started - 
ignoring session_start()");
-   return;
-   } else {
-   PS(define_sid) = 1;
-   PS(sen

[PHP-CVS] cvs: php-src /ext/session session.c

2008-08-05 Thread Jani Taskinen

janiWed Aug  6 04:48:40 2008 UTC

  Modified files:  
/php-src/ext/sessionsession.c 
  Log:
  - MFB: sync parameter parsing API changes in session_set_save_handler()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.490&r2=1.491&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.490 php-src/ext/session/session.c:1.491
--- php-src/ext/session/session.c:1.490 Wed Aug  6 04:24:55 2008
+++ php-src/ext/session/session.c   Wed Aug  6 04:48:39 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.490 2008/08/06 04:24:55 jani Exp $ */
+/* $Id: session.c,v 1.491 2008/08/06 04:48:39 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1503,21 +1503,25 @@
Sets user-level functions */
 static PHP_FUNCTION(session_set_save_handler)
 {
-   zval **args[6];
-   int i;
+   zval ***args = NULL;
+   int i, num_args, argc = ZEND_NUM_ARGS();
zval name;
 
if (PS(session_status) != php_session_none) {
RETURN_FALSE;
}
 
-   if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_array_ex(6, args) == 
FAILURE) {
+   if (argc != 6) {
WRONG_PARAM_COUNT;
}
 
+   if (zend_parse_parameters(argc TSRMLS_CC, "+", &args, &num_args) == 
FAILURE) {
+   return;
+   }
 
for (i = 0; i < 6; i++) {
if (!zend_is_callable(*args[i], 0, &name TSRMLS_CC)) {
+   efree(args);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument 
%d is not a valid callback", i+1);
zval_dtor(&name);
RETURN_FALSE;
@@ -1531,10 +1535,11 @@
if (PS(mod_user_names).names[i] != NULL) {
zval_ptr_dtor(&PS(mod_user_names).names[i]);
}
-   Z_ADDREF_P(*args[i]);
+   Z_ADDREF_PP(args[i]);
PS(mod_user_names).names[i] = *args[i];
}
 
+   efree(args);
RETURN_TRUE;
 }
 /* }}} */



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

[PHP-CVS] cvs: php-src /ext/session session.c

2008-08-05 Thread Jani Taskinen

janiWed Aug  6 04:24:55 2008 UTC

  Modified files:  
/php-src/ext/sessionsession.c 
  Log:
  - MFB: snprintf -> slprintf, nuketh extra folding tags, ws fixes
  http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.489&r2=1.490&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.489 php-src/ext/session/session.c:1.490
--- php-src/ext/session/session.c:1.489 Wed Aug  6 00:36:14 2008
+++ php-src/ext/session/session.c   Wed Aug  6 04:24:55 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.489 2008/08/06 00:36:14 jani Exp $ */
+/* $Id: session.c,v 1.490 2008/08/06 04:24:55 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -200,7 +200,6 @@
} else {
 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode 
non-existent session");
}
-
return ret;
 }
 /* }}} */
@@ -541,6 +540,7 @@
 
if (PG(modules_activated) && !tmp) {
int err_type;
+
if (stage == ZEND_INI_STAGE_RUNTIME) {
err_type = E_WARNING;
} else {
@@ -560,7 +560,7 @@
 {
/* Only do the safemode/open_basedir check at runtime */
if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) {
-   char *p;
+   char *p;
 
if (memchr(new_value, '\0', new_value_length) != NULL) {
return FAILURE;
@@ -637,11 +637,11 @@
STD_PHP_INI_ENTRY("session.name",   "PHPSESSID", 
PHP_INI_ALL, OnUpdateString, session_name,   php_ps_globals,ps_globals)
PHP_INI_ENTRY("session.save_handler",   "files", 
PHP_INI_ALL, OnUpdateSaveHandler)
STD_PHP_INI_BOOLEAN("session.auto_start",   "0", 
PHP_INI_ALL, OnUpdateBool,   auto_start, php_ps_globals,ps_globals)
-   STD_PHP_INI_ENTRY("session.gc_probability", "1", 
PHP_INI_ALL, OnUpdateLong,gc_probability, php_ps_globals,ps_globals)
-   STD_PHP_INI_ENTRY("session.gc_divisor", "100",   
PHP_INI_ALL, OnUpdateLong,gc_divisor,php_ps_globals,ps_globals)
-   STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440",  
PHP_INI_ALL, OnUpdateLong,gc_maxlifetime, php_ps_globals,ps_globals)
+   STD_PHP_INI_ENTRY("session.gc_probability", "1", 
PHP_INI_ALL, OnUpdateLong,   gc_probability, php_ps_globals,ps_globals)
+   STD_PHP_INI_ENTRY("session.gc_divisor", "100",   
PHP_INI_ALL, OnUpdateLong,   gc_divisor, php_ps_globals,ps_globals)
+   STD_PHP_INI_ENTRY("session.gc_maxlifetime", "1440",  
PHP_INI_ALL, OnUpdateLong,   gc_maxlifetime, php_ps_globals,ps_globals)
PHP_INI_ENTRY("session.serialize_handler",  "php",   
PHP_INI_ALL, OnUpdateSerializer)
-   STD_PHP_INI_ENTRY("session.cookie_lifetime","0", 
PHP_INI_ALL, OnUpdateLong,cookie_lifetime,php_ps_globals,ps_globals)
+   STD_PHP_INI_ENTRY("session.cookie_lifetime","0", 
PHP_INI_ALL, OnUpdateLong,   cookie_lifetime,php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY("session.cookie_path","/", 
PHP_INI_ALL, OnUpdateString, cookie_path,php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY("session.cookie_domain",  "",  
PHP_INI_ALL, OnUpdateString, cookie_domain,  php_ps_globals,ps_globals)
STD_PHP_INI_BOOLEAN("session.cookie_secure","",  
PHP_INI_ALL, OnUpdateBool,   cookie_secure,  php_ps_globals,ps_globals)
@@ -650,12 +650,12 @@
STD_PHP_INI_BOOLEAN("session.use_only_cookies", "1", 
PHP_INI_ALL, OnUpdateBool,   use_only_cookies,   php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY("session.referer_check",  "",  
PHP_INI_ALL, OnUpdateString, extern_referer_chk, php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY("session.entropy_file",   "",  
PHP_INI_ALL, OnUpdateString, entropy_file,   php_ps_globals,ps_globals)
-   STD_PHP_INI_ENTRY("session.entropy_length", "0", 
PHP_INI_ALL, OnUpdateLong,entropy_length, php_ps_globals,ps_globals)
+   STD_PHP_INI_ENTRY("session.entropy_length", "0", 
PHP_INI_ALL, OnUpdateLong,   entropy_length, php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY("session.cache_limiter",  "nocache",   
PHP_INI_ALL, OnUpdateString, cache_limiter,  php_ps_globals,ps_globals)
-   STD_PHP_INI_ENTRY("session.cache_expire",   "180",   
PHP_INI_ALL, OnUpdateLong,cache_expire,   php_ps_globals,ps_globals)
-   PHP_INI_ENTRY("session.use_trans_sid",  "0", 
PHP_INI_ALL, OnUpdateTransSid)
-   PHP_INI_ENTRY("session.hash_function",  "0", 
PHP_INI_ALL, OnUpdateHas

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard credits_sapi.h

2008-08-05 Thread Johannes Schlüter

johannesWed Aug  6 02:37:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/ext/standard   credits_sapi.h 
  Log:
  - litespeed was merged from HEAD
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.248&r2=1.2027.2.547.2.965.2.249&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.248 
php-src/NEWS:1.2027.2.547.2.965.2.249
--- php-src/NEWS:1.2027.2.547.2.965.2.248   Tue Aug  5 18:03:46 2008
+++ php-src/NEWSWed Aug  6 02:37:16 2008
@@ -2,6 +2,9 @@
 |||
 ?? ??? 200?, PHP 5.3.0 Alpha 2
 - Removed shebang line check from CGI sapi (it is checked by scanner) (Dmitry)
+
+- Added litespeed SAPI module. (George Wang)
+
 - Fixed a bug that caused miscalculations with the "last  of 
   month" relative time string. (Derick)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_sapi.h?r1=1.17.2.1.2.1&r2=1.17.2.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/credits_sapi.h
diff -u php-src/ext/standard/credits_sapi.h:1.17.2.1.2.1 
php-src/ext/standard/credits_sapi.h:1.17.2.1.2.1.2.1
--- php-src/ext/standard/credits_sapi.h:1.17.2.1.2.1Sun Apr 29 00:43:11 2007
+++ php-src/ext/standard/credits_sapi.h Wed Aug  6 02:37:17 2008
@@ -21,6 +21,7 @@
 CREDIT_LINE("Continuity", "Alex Leigh (based on nsapi code)");
 CREDIT_LINE("Embed", "Edin Kadribasic");
 CREDIT_LINE("ISAPI", "Andi Gutmans, Zeev Suraski");
+CREDIT_LINE("litespeed", "George Wang");
 CREDIT_LINE("NSAPI", "Jayakumar Muthukumarasamy, Uwe Schindler");
 CREDIT_LINE("phttpd", "Thies C. Arntzen");
 CREDIT_LINE("pi3web", "Holger Zimmermann");



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c

2008-08-05 Thread Olivier Hill

What should be MFH'ed?

I haven't touched HEAD with this. I don't have cvs access here, will
only be able to commit friday.

Is there still regression issues or my last patch fixed it?

Thanks
Olivier (Mobile)



On 8/5/08, Lukas Kahwe Smith <[EMAIL PROTECTED]> wrote:
>
> On 31.07.2008, at 09:18, Derick Rethans wrote:
>
>> On Mon, 28 Jul 2008, Olivier Hill wrote:
>>
>>> Indeed, I forgot to test that case. If I remember correctly, there
>>> was
>>> no test cases for that function, so I'll fix this tonight and add
>>> some
>>> tests.
>>
>> I didn't see a commit - have you forgotten about it?
>>
>> regards,
>> Derick
>
>
> still not MFH'ed .. or?
>
> regards,
> Lukas Kahwe Smith
> [EMAIL PROTECTED]
>
>
>
>


-- 
Olivier Hill, ing. jr.
http://www.olivierhill.ca/

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

[PHP-CVS] cvs: php-src /ext/session session.c

2008-08-05 Thread Jani Taskinen

janiWed Aug  6 00:36:14 2008 UTC

  Modified files:  
/php-src/ext/sessionsession.c 
  Log:
  ws + folding tags
  http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.488&r2=1.489&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.488 php-src/ext/session/session.c:1.489
--- php-src/ext/session/session.c:1.488 Tue Aug  5 22:52:35 2008
+++ php-src/ext/session/session.c   Wed Aug  6 00:36:14 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.488 2008/08/05 22:52:35 jani Exp $ */
+/* $Id: session.c,v 1.489 2008/08/06 00:36:14 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,7 +43,7 @@
 #include "ext/standard/datetime.h"
 #include "ext/standard/php_lcg.h"
 #include "ext/standard/url_scanner_ex.h"
-#include "ext/standard/php_rand.h"   /* for RAND_MAX */
+#include "ext/standard/php_rand.h" /* for RAND_MAX */
 #include "ext/standard/info.h"
 #include "ext/standard/php_smart_str.h"
 #include "ext/standard/url.h"
@@ -77,7 +77,7 @@
}
 
 /* Dispatched by RINIT and by php_session_destroy */
-static inline void php_rinit_session_globals(TSRMLS_D)
+static inline void php_rinit_session_globals(TSRMLS_D) /* {{{ */
 {
PS(id) = NULL;
PS(session_status) = php_session_none;
@@ -85,9 +85,10 @@
/* Do NOT init PS(mod_user_names) here! */
PS(http_session_vars) = NULL;
 }
+/* }}} */
 
 /* Dispatched by RSHUTDOWN and by php_session_destroy */
-static inline void php_rshutdown_session_globals(TSRMLS_D)
+static inline void php_rshutdown_session_globals(TSRMLS_D) /* {{{ */
 {
if (PS(http_session_vars)) {
zval_ptr_dtor(&PS(http_session_vars));
@@ -103,8 +104,9 @@
efree(PS(id));
}
 }
+/* }}} */
 
-static int php_session_destroy(TSRMLS_D)
+static int php_session_destroy(TSRMLS_D) /* {{{ */
 {
int retval = SUCCESS;
 
@@ -117,17 +119,18 @@
retval = FAILURE;
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Session object 
destruction failed");
}
-   
+
php_rshutdown_session_globals(TSRMLS_C);
php_rinit_session_globals(TSRMLS_C);
 
return retval;
 }
+/* }}} */
 
-PHPAPI void php_add_session_var(char *name, size_t namelen TSRMLS_DC)
+PHPAPI void php_add_session_var(char *name, size_t namelen TSRMLS_DC) /* {{{ */
 {
zval **sym_track = NULL;
-   
+
IF_SESSION_VARS() {
zend_rt_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, 
namelen + 1,
(void *) &sym_track);
@@ -142,15 +145,17 @@
ZEND_SET_SYMBOL_WITH_LENGTH(Z_ARRVAL_P(PS(http_session_vars)), 
name, namelen+1, empty_var, 1, 0);
}
 }
+/* }}} */
 
 /* BC? */
-PHPAPI void php_set_session_var(char *name, size_t namelen, zval *state_val, 
php_unserialize_data_t *var_hash TSRMLS_DC)
+PHPAPI void php_set_session_var(char *name, size_t namelen, zval *state_val, 
php_unserialize_data_t *var_hash TSRMLS_DC) /* {{{ */
 {
zend_utf8_hash_update(Z_ARRVAL_P(PS(http_session_vars)), name, namelen 
+ 1, &state_val, sizeof(zval *), NULL);
zval_add_ref(&state_val);
 }
+/* }}} */
 
-PHPAPI int php_get_session_var(char *name, size_t namelen, zval ***state_var 
TSRMLS_DC)
+PHPAPI int php_get_session_var(char *name, size_t namelen, zval ***state_var 
TSRMLS_DC) /* {{{ */
 {
int ret = FAILURE;
 
@@ -158,14 +163,14 @@
ret = zend_rt_hash_find(Z_ARRVAL_P(PS(http_session_vars)), 
name, 
namelen+1, (void **) state_var);
}
-   
return ret;
 }
+/* }}} */
 
-static void php_session_track_init(TSRMLS_D)
+static void php_session_track_init(TSRMLS_D) /* {{{ */
 {
zval *session_vars = NULL;
-   
+
/* Unconditionally destroy existing arrays -- possible dirty data */
zend_delete_global_variable("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
 
@@ -176,11 +181,12 @@
MAKE_STD_ZVAL(session_vars);
array_init(session_vars);
PS(http_session_vars) = session_vars;
-   
+
ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), 
PS(http_session_vars), 2, 1);
 }
+/* }}} */
 
-static char *php_session_encode(int *newlen TSRMLS_DC)
+static char *php_session_encode(int *newlen TSRMLS_DC) /* {{{ */
 {
char *ret = NULL;
 
@@ -197,8 +203,9 @@
 
return ret;
 }
+/* }}} */
 
-static void php_session_decode(const char *val, int vallen TSRMLS_DC)
+static void php_session_decode(const char *val, int vallen TSRMLS_DC) /* {{{ */
 {
if (!PS(serializer)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown 
session.serialize_handler. Failed to decode session object");
@@ -209,7 +216,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode 
session object. Session has been destroyed");

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session php_session.h

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 23:04:34 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/sessionphp_session.h 
  Log:
  - nuketh period from error message
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/php_session.h?r1=1.101.2.2.2.5.2.2&r2=1.101.2.2.2.5.2.3&diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.101.2.2.2.5.2.2 
php-src/ext/session/php_session.h:1.101.2.2.2.5.2.3
--- php-src/ext/session/php_session.h:1.101.2.2.2.5.2.2 Fri Mar  7 23:20:32 2008
+++ php-src/ext/session/php_session.h   Tue Aug  5 23:04:31 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_session.h,v 1.101.2.2.2.5.2.2 2008/03/07 23:20:32 gwynne Exp $ */
+/* $Id: php_session.h,v 1.101.2.2.2.5.2.3 2008/08/05 23:04:31 jani Exp $ */
 
 #ifndef PHP_SESSION_H
 #define PHP_SESSION_H
@@ -240,7 +240,7 @@
(key_type = zend_hash_get_current_key_ex(_ht, 
&key, &key_length, &num_key, 0, NULL)) != HASH_KEY_NON_EXISTANT; \
zend_hash_move_forward(_ht)) {  
\
if (key_type == HASH_KEY_IS_LONG) { 
\
-   php_error_docref(NULL TSRMLS_CC, E_NOTICE, 
"Skipping numeric key %ld.", num_key); \
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, 
"Skipping numeric key %ld", num_key); \
continue;   
\
}   
\
key_length--;   
\



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

[PHP-CVS] cvs: php-src /ext/session session.c

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 22:52:35 2008 UTC

  Modified files:  
/php-src/ext/sessionsession.c 
  Log:
  - Nuke ending period
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.487&r2=1.488&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.487 php-src/ext/session/session.c:1.488
--- php-src/ext/session/session.c:1.487 Mon Aug  4 06:18:27 2008
+++ php-src/ext/session/session.c   Tue Aug  5 22:52:35 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.487 2008/08/04 06:18:27 kalle Exp $ */
+/* $Id: session.c,v 1.488 2008/08/05 22:52:35 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1527,7 +1527,7 @@
 
if (name) {
if (memchr(name, '\0', name_len) != NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "The 
save_path cannot contain NULL characters.");
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "The 
save_path cannot contain NULL characters");
 
zval_dtor(return_value);
RETURN_FALSE;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/session session.c

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 22:52:05 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/sessionsession.c 
  Log:
  - Nuke ending periods from error messages
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.12&r2=1.417.2.8.2.40.2.13&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.12 
php-src/ext/session/session.c:1.417.2.8.2.40.2.13
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.12   Mon Aug  4 06:21:55 2008
+++ php-src/ext/session/session.c   Tue Aug  5 22:52:05 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.417.2.8.2.40.2.12 2008/08/04 06:21:55 kalle Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.13 2008/08/05 22:52:05 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -168,7 +168,7 @@
 
 #define SESSION_CHECK_ACTIVE_STATE \
if (PS(session_status) == php_session_active) { \
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "A session is 
active. You cannot change the session module's ini settings at this time.");  \
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "A session is 
active. You cannot change the session module's ini settings at this time");   \
return FAILURE; \
}   \
 
@@ -714,13 +714,13 @@
 
IF_SESSION_VARS() {
if (!PS(serializer)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown 
session.serialize_handler. Failed to encode session object.");
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown 
session.serialize_handler. Failed to encode session object");
ret = NULL;
}
else if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == 
FAILURE)
ret = NULL;
} else {
-php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode 
non-existent session.");
+php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode 
non-existent session");
}
 
return ret;
@@ -729,12 +729,12 @@
 static void php_session_decode(const char *val, int vallen TSRMLS_DC)
 {
if (!PS(serializer)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown 
session.serialize_handler. Failed to decode session object.");
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown 
session.serialize_handler. Failed to decode session object");
return;
}
if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
php_session_destroy(TSRMLS_C);
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode 
session object. Session has been destroyed.");
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode 
session object. Session has been destroyed");
}
 }
 
@@ -895,7 +895,7 @@
}
 
if (!PS(mod)) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, "No storage module 
chosen - failed to initialize session.");
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, "No storage module 
chosen - failed to initialize session");
return;
}
 
@@ -957,7 +957,7 @@
case HASH_KEY_IS_LONG:
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The session 
bug compatibility code will not "
"try to locate the global variable $%lu 
due to its "
-   "numeric nature.", num_key);
+   "numeric nature", num_key);
break;
}

@@ -987,7 +987,7 @@
}
 
if (do_warn && PS(bug_compat_warn)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Your script possibly relies on a session side-effect which existed until PHP 
4.2.3. Please be advised that the session extension does not consider global 
variables as a source of data, unless register_globals is enabled. You can 
disable this functionality and this warning by setting session.bug_compat_42 or 
session.bug_compat_warn to off, respectively.");
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Your script possibly relies on a session side-effect which existed until PHP 
4.2.3. Please be advised that the session extension does not consider global 
variables as a source of data, unless register_globals is enabled. You can 
disable this functionality and this warning by setting session.bug_compat_42 or 
session.bug_compat_warn to off, respectively");
}
}
 



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

[PHP-CVS] cvs: php-src /sapi/litespeed CREDITS

2008-08-05 Thread George Wang

gwang   Tue Aug  5 22:30:56 2008 UTC

  Added files: 
/php-src/sapi/litespeed CREDITS 
  Log:
  add CREDITS
  



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

[PHP-CVS] cvs: php-src /ext/standard/tests/strings explode_bug.phpt

2008-08-05 Thread Stanislav Malyshev

stasTue Aug  5 21:59:11 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/strings explode_bug.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_bug.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/explode_bug.phpt
diff -u php-src/ext/standard/tests/strings/explode_bug.phpt:1.2 
php-src/ext/standard/tests/strings/explode_bug.phpt:1.3
--- php-src/ext/standard/tests/strings/explode_bug.phpt:1.2 Tue Aug  5 
21:23:20 2008
+++ php-src/ext/standard/tests/strings/explode_bug.phpt Tue Aug  5 21:59:11 2008
@@ -5,7 +5,7 @@
 memory_limit=256M
 --FILE--
 
 --EXPECTF--



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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 21:48:19 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  useless entry
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1190&r2=1.2027.2.547.2.1191&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1190 php-src/NEWS:1.2027.2.547.2.1191
--- php-src/NEWS:1.2027.2.547.2.1190Tue Aug  5 21:40:48 2008
+++ php-src/NEWSTue Aug  5 21:48:18 2008
@@ -13,7 +13,6 @@
   functions. (Andrey)
 - Fixed a regression when using strip_tags() and < is within an attribute.
   (Scott)
-- Fixed memnstr bug, reported by Laurent Gaffie (Stas)
 
 - Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter).
   (Jani)



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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-08-05 Thread Stanislav Malyshev

stasTue Aug  5 21:40:49 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  ok, clarify :)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1189&r2=1.2027.2.547.2.1190&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1189 php-src/NEWS:1.2027.2.547.2.1190
--- php-src/NEWS:1.2027.2.547.2.1189Tue Aug  5 21:24:42 2008
+++ php-src/NEWSTue Aug  5 21:40:48 2008
@@ -13,7 +13,7 @@
   functions. (Andrey)
 - Fixed a regression when using strip_tags() and < is within an attribute.
   (Scott)
-- Fixed memnstr bug by Laurent Gaffie (Stas)
+- Fixed memnstr bug, reported by Laurent Gaffie (Stas)
 
 - Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter).
   (Jani)



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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings explode_bug.phpt ZendEngine2 zend_operators.h

2008-08-05 Thread Stanislav Malyshev


Hi!


I assume this is credit, not blame? :)
Is this change NEWS worthy?


Yes on both counts.
--
Stanislav Malyshev, Zend Software Architect
[EMAIL PROTECTED]   http://www.zend.com/
(408)253-8829   MSN: [EMAIL PROTECTED]

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings explode_bug.phpt ZendEngine2 zend_operators.h

2008-08-05 Thread Hannes Magnusson

On Tue, Aug 5, 2008 at 22:11, Stanislav Malyshev <[EMAIL PROTECTED]> wrote:
> stasTue Aug  5 20:11:17 2008 UTC
>
>  Added files: (Branch: PHP_5_2)
>/php-src/ext/standard/tests/strings explode_bug.phpt
>
>  Modified files:
>/ZendEngine2zend_operators.h
>  Log:
>  fix memnstr bug, by Laurent Gaffie

I assume this is credit, not blame? :)
Is this change NEWS worthy?

-Hannes

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

[PHP-CVS] cvs: CVSROOT / avail

2008-08-05 Thread Andrei Zmievski

andrei  Tue Aug  5 21:25:30 2008 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  Give karma to akshat.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1430&r2=1.1431&diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1430 CVSROOT/avail:1.1431
--- CVSROOT/avail:1.1430Fri Aug  1 14:31:16 2008
+++ CVSROOT/avail   Tue Aug  5 21:25:29 2008
@@ -137,6 +137,7 @@
 avail|wez,sterling,edink,derick,tal,bs,magnus|embed,embed-web
 avail|hholzgra,stas,derick|functable
 avail|alan_k|php-gtk/ext/gtkhtml,php-gtk/ext/scintilla
+avail|akshat|php-gtk/ext/cairo
 avail|jmoore,alan_k|php-gtk/generator
 avail|sterling|php-src/ext/bz2
 avail|grantc|php-src/ext/ingres_ii,pecl/ingres



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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-08-05 Thread Stanislav Malyshev

stasTue Aug  5 21:24:43 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  add bugfix
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1188&r2=1.2027.2.547.2.1189&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1188 php-src/NEWS:1.2027.2.547.2.1189
--- php-src/NEWS:1.2027.2.547.2.1188Mon Aug  4 21:16:21 2008
+++ php-src/NEWSTue Aug  5 21:24:42 2008
@@ -13,6 +13,7 @@
   functions. (Andrey)
 - Fixed a regression when using strip_tags() and < is within an attribute.
   (Scott)
+- Fixed memnstr bug by Laurent Gaffie (Stas)
 
 - Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter).
   (Jani)



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8.c

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 20:56:25 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/oci8   oci8.c 
  Log:
  - MFH: fix oci8_11g when build shared (invalid extension)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.20&r2=1.269.2.16.2.38.2.21&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.20 
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.21
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.20Thu Jul 24 15:24:14 2008
+++ php-src/ext/oci8/oci8.c Tue Aug  5 20:56:25 2008
@@ -26,7 +26,7 @@
+--+
 */
 
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.20 2008/07/24 15:24:14 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.21 2008/08/05 20:56:25 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -107,7 +107,7 @@
 /* }}} */
 
 /* {{{ dynamically loadable module stuff */
-#ifdef COMPILE_DL_OCI8
+#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G)
 ZEND_GET_MODULE(oci8)
 #endif /* COMPILE_DL */
 /* }}} */
@@ -1018,7 +1018,7 @@
 
 zend_module_entry oci8_module_entry = {
STANDARD_MODULE_HEADER,
-   "oci8",   /* extension name */
+   "oci8_11g",   /* extension name */
php_oci_functions,/* extension function list */
PHP_MINIT(oci),   /* extension-wide startup function */
PHP_MSHUTDOWN(oci),   /* extension-wide shutdown function */
@@ -1311,7 +1311,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
-   php_info_print_table_row(2, "Revision", "$Revision: 
1.269.2.16.2.38.2.20 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 
1.269.2.16.2.38.2.21 $");
 
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);



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

[PHP-CVS] cvs: php-src /ext/oci8 oci8.c

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 20:56:03 2008 UTC

  Modified files:  
/php-src/ext/oci8   oci8.c 
  Log:
  - fix oci8_11g when build shared (invalid extension)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.353&r2=1.354&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.353 php-src/ext/oci8/oci8.c:1.354
--- php-src/ext/oci8/oci8.c:1.353   Thu Jul 24 15:23:29 2008
+++ php-src/ext/oci8/oci8.c Tue Aug  5 20:56:03 2008
@@ -26,7 +26,7 @@
+--+
 */
 
-/* $Id: oci8.c,v 1.353 2008/07/24 15:23:29 sixd Exp $ */
+/* $Id: oci8.c,v 1.354 2008/08/05 20:56:03 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -99,7 +99,7 @@
 /* }}} */
 
 /* {{{ dynamically loadable module stuff */
-#ifdef COMPILE_DL_OCI8
+#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G)
 ZEND_GET_MODULE(oci8)
 #endif /* COMPILE_DL */
 /* }}} */
@@ -1169,7 +1169,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
-   php_info_print_table_row(2, "Revision", "$Revision: 1.353 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.354 $");
 
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);



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

[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.w32 /ext/sqlite3 config.w32

2008-08-05 Thread Elizabeth Marie Smith

auroraeosrose   Tue Aug  5 20:22:54 2008 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.w32 
/php-src/ext/sqlite3config.w32 
  Log:
  Some fancy detection for sqlite3 and pdo_sqlite3 - so the two extensions 
don't depend on each other if shared, and don't try to put two versions of the 
sqlite3 lib if static
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.12 
php-src/ext/pdo_sqlite/config.w32:1.13
--- php-src/ext/pdo_sqlite/config.w32:1.12  Thu Jul 24 14:20:51 2008
+++ php-src/ext/pdo_sqlite/config.w32   Tue Aug  5 20:22:53 2008
@@ -1,13 +1,16 @@
-// $Id: config.w32,v 1.12 2008/07/24 14:20:51 scottmac Exp $
+// $Id: config.w32,v 1.13 2008/08/05 20:22:53 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
-   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"pdo_sqlite");
-
+   
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
+   // If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs
+   if (PHP_PDO_SQLITE_SHARED || PHP_SQLITE3_SHARED || PHP_SQLITE3 == 'no') 
{
+   ADD_SOURCES(configure_module_dirname + "/../sqlite3/libsqlite", 
"sqlite3.c", "pdo_sqlite");
+   }
 }
 
 ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", 
"no");
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.2 php-src/ext/sqlite3/config.w32:1.3
--- php-src/ext/sqlite3/config.w32:1.2  Sat Jul 26 01:23:45 2008
+++ php-src/ext/sqlite3/config.w32  Tue Aug  5 20:22:53 2008
@@ -1,17 +1,13 @@
-// $Id: config.w32,v 1.2 2008/07/26 01:23:45 scottmac Exp $
-// vim:ft=javascript
-
-ARG_WITH("sqlite3", "SQLite 3 support", "no");
-
-if (PHP_SQLITE3 != "no") {
-   ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=1 /D 
SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 ");
-   EXTENSION("sqlite3", "sqlite3.c", null, "/I" + configure_module_dirname 
+ "/libsqlite /I" + configure_module_dirname);
-
-   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");
-
-   AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
-
-   if (!PHP_SQLITE3_SHARED) {
-   ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite3.def");
-   }
-}
+// $Id: config.w32,v 1.3 2008/08/05 20:22:53 auroraeosrose Exp $
+// vim:ft=javascript
+
+ARG_WITH("sqlite3", "SQLite 3 support", "no");
+
+if (PHP_SQLITE3 != "no") {
+   ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=1 /D 
SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 ");
+   EXTENSION("sqlite3", "sqlite3.c", null, "/I" + configure_module_dirname 
+ "/libsqlite /I" + configure_module_dirname);
+
+   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");
+
+   AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
+}



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite config.w32 /ext/sqlite3 config.w32

2008-08-05 Thread Elizabeth Marie Smith

auroraeosrose   Tue Aug  5 20:16:21 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite config.w32 
/php-src/ext/sqlite3config.w32 
  Log:
  Some fancy detection for sqlite3 and pdo_sqlite3 - so the two extensions 
don't depend on each other if shared, and don't try to put two versions of the 
sqlite3 lib if static
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.6.2.1.2.3.2.5&r2=1.6.2.1.2.3.2.6&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.5 
php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.6
--- php-src/ext/pdo_sqlite/config.w32:1.6.2.1.2.3.2.5   Thu Jul 24 14:25:33 2008
+++ php-src/ext/pdo_sqlite/config.w32   Tue Aug  5 20:16:21 2008
@@ -1,13 +1,16 @@
-// $Id: config.w32,v 1.6.2.1.2.3.2.5 2008/07/24 14:25:33 scottmac Exp $
+// $Id: config.w32,v 1.6.2.1.2.3.2.6 2008/08/05 20:16:21 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
-   ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"pdo_sqlite");
-
+   
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
+   // If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs
+   if (PHP_PDO_SQLITE_SHARED || PHP_SQLITE3_SHARED || PHP_SQLITE3 == 'no') 
{
+   ADD_SOURCES(configure_module_dirname + "/../sqlite3/libsqlite", 
"sqlite3.c", "pdo_sqlite");
+   }
 }
 
 ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", 
"no");
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.1.2.1 
php-src/ext/sqlite3/config.w32:1.1.2.2
--- php-src/ext/sqlite3/config.w32:1.1.2.1  Fri Jul 25 02:44:57 2008
+++ php-src/ext/sqlite3/config.w32  Tue Aug  5 20:16:21 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.2.1 2008/07/25 02:44:57 scottmac Exp $
+// $Id: config.w32,v 1.1.2.2 2008/08/05 20:16:21 auroraeosrose Exp $
 // vim:ft=javascript
 
 ARG_WITH("sqlite3", "SQLite 3 support", "no");
@@ -10,8 +10,4 @@
ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"sqlite3");
 
AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
-
-   if (!PHP_SQLITE3_SHARED) {
-   ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite3.def");
-   }
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings explode_bug.phpt ZendEngine2 zend_operators.h

2008-08-05 Thread Stanislav Malyshev

stasTue Aug  5 20:14:27 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings explode_bug.phpt 

  Modified files:  
/ZendEngine2zend_operators.h 
  Log:
  fix memnstr bug, by Laurent Gaffie
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.94.2.4.2.10.2.9&r2=1.94.2.4.2.10.2.10&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.9 
ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.10
--- ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.9  Thu Jul 24 20:39:48 2008
+++ ZendEngine2/zend_operators.hTue Aug  5 20:14:27 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.9 2008/07/24 20:39:48 moriyoshi Exp 
$ */
+/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.10 2008/08/05 20:14:27 stas Exp $ */
 
 #ifndef ZEND_OPERATORS_H
 #define ZEND_OPERATORS_H
@@ -224,6 +224,10 @@
return (char *)memchr(p, *needle, (end-p));
}
 
+   if(needle_len > end-haystack) {
+   return NULL;
+   }
+
end -= needle_len;
 
while (p <= end) {

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_bug.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/strings/explode_bug.phpt
+++ php-src/ext/standard/tests/strings/explode_bug.phpt



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings explode_bug.phpt ZendEngine2 zend_operators.h

2008-08-05 Thread Stanislav Malyshev

stasTue Aug  5 20:11:17 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings explode_bug.phpt 

  Modified files:  
/ZendEngine2zend_operators.h 
  Log:
  fix memnstr bug, by Laurent Gaffie
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.94.2.4.2.11&r2=1.94.2.4.2.12&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.94.2.4.2.11 
ZendEngine2/zend_operators.h:1.94.2.4.2.12
--- ZendEngine2/zend_operators.h:1.94.2.4.2.11  Mon Dec 31 07:20:03 2007
+++ ZendEngine2/zend_operators.hTue Aug  5 20:11:17 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_operators.h,v 1.94.2.4.2.11 2007/12/31 07:20:03 sebastian Exp $ */
+/* $Id: zend_operators.h,v 1.94.2.4.2.12 2008/08/05 20:11:17 stas Exp $ */
 
 #ifndef ZEND_OPERATORS_H
 #define ZEND_OPERATORS_H
@@ -220,6 +220,9 @@
char *p = haystack;
char ne = needle[needle_len-1];
 
+   if(needle_len > end-haystack) {
+   return NULL;
+   }
end -= needle_len;
 
while (p <= end) {

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_bug.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/strings/explode_bug.phpt
+++ php-src/ext/standard/tests/strings/explode_bug.phpt



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl config.w32

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 19:40:16 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   config.w32 
  Log:
  - MFH: fix zlib detection (shared/static) and add zlib_a support
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.3.4.1.2.2&r2=1.3.4.1.2.2.2.1&diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.3.4.1.2.2 
php-src/ext/curl/config.w32:1.3.4.1.2.2.2.1
--- php-src/ext/curl/config.w32:1.3.4.1.2.2 Tue Nov 14 19:57:13 2006
+++ php-src/ext/curl/config.w32 Tue Aug  5 19:40:16 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3.4.1.2.2 2006/11/14 19:57:13 edink Exp $
+// $Id: config.w32,v 1.3.4.1.2.2.2.1 2008/08/05 19:40:16 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("curl", "cURL support", "no");
@@ -8,9 +8,10 @@
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") 
&&
CHECK_LIB("ssleay32.lib", "curl", PHP_CURL) &&
CHECK_LIB("libeay32.lib", "curl", PHP_CURL) &&
-   CHECK_LIB("zlib.lib", "curl", PHP_CURL) &&
+   (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || 
CHECK_LIB("zlib.lib", "gd", PHP_GD))) || 
+   (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
CHECK_LIB("winmm.lib", "curl", PHP_CURL)) {
-   EXTENSION("curl", "interface.c multi.c streams.c");
+   EXTENSION("curl", "interface.c multi.c streams.c", true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");



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

[PHP-CVS] cvs: php-src /ext/curl config.w32

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 19:39:52 2008 UTC

  Modified files:  
/php-src/ext/curl   config.w32 
  Log:
  - fix zlib detection (shared/static) and add zlib_a support
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.6 php-src/ext/curl/config.w32:1.7
--- php-src/ext/curl/config.w32:1.6 Tue Nov 14 19:57:35 2006
+++ php-src/ext/curl/config.w32 Tue Aug  5 19:39:51 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2006/11/14 19:57:35 edink Exp $
+// $Id: config.w32,v 1.7 2008/08/05 19:39:51 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("curl", "cURL support", "no");
@@ -8,7 +8,8 @@
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") 
&&
CHECK_LIB("ssleay32.lib", "curl", PHP_CURL) &&
CHECK_LIB("libeay32.lib", "curl", PHP_CURL) &&
-   CHECK_LIB("zlib.lib", "curl", PHP_CURL) &&
+   (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || 
CHECK_LIB("zlib.lib", "gd", PHP_GD))) || 
+   (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", 
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
CHECK_LIB("winmm.lib", "curl", PHP_CURL)) {
EXTENSION("curl", "interface.c multi.c streams.c");
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/date/lib tm2unixtime.c /ext/date/tests date_period.phpt

2008-08-05 Thread Derick Rethans

derick  Tue Aug  5 18:03:47 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests date_period.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/date/lib   tm2unixtime.c 
  Log:
  - MFH: Fixed a bug that caused miscalculations with the "last  of 
month" relative time string.
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.247&r2=1.2027.2.547.2.965.2.248&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.247 
php-src/NEWS:1.2027.2.547.2.965.2.248
--- php-src/NEWS:1.2027.2.547.2.965.2.247   Mon Aug  4 07:20:14 2008
+++ php-src/NEWSTue Aug  5 18:03:46 2008
@@ -2,6 +2,8 @@
 |||
 ?? ??? 200?, PHP 5.3.0 Alpha 2
 - Removed shebang line check from CGI sapi (it is checked by scanner) (Dmitry)
+- Fixed a bug that caused miscalculations with the "last  of 
+  month" relative time string. (Derick)
 
 - Fixed bug #45696 (Not all DateTime methods allow method chaining). (Derick)
 - Fixed bug #45545 (DateInterval has a limitation of 4 chars for ISO
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/tm2unixtime.c?r1=1.13.2.3.2.2.2.10&r2=1.13.2.3.2.2.2.11&diff_format=u
Index: php-src/ext/date/lib/tm2unixtime.c
diff -u php-src/ext/date/lib/tm2unixtime.c:1.13.2.3.2.2.2.10 
php-src/ext/date/lib/tm2unixtime.c:1.13.2.3.2.2.2.11
--- php-src/ext/date/lib/tm2unixtime.c:1.13.2.3.2.2.2.10Tue Jul  8 
17:55:59 2008
+++ php-src/ext/date/lib/tm2unixtime.c  Tue Aug  5 18:03:47 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: tm2unixtime.c,v 1.13.2.3.2.2.2.10 2008/07/08 17:55:59 derick Exp $ */
+/* $Id: tm2unixtime.c,v 1.13.2.3.2.2.2.11 2008/08/05 18:03:47 derick Exp $ */
 
 #include "timelib.h"
 
@@ -277,6 +277,7 @@
break;
}
}
+   do_normalize(time);
 }
 
 static timelib_sll do_years(timelib_sll year)

http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_period.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/date_period.phpt
+++ php-src/ext/date/tests/date_period.phpt
--TEST--
DatePeriod
--INI--
date.timezone=UTC
--FILE--
modify( "3 tuesday" )->format( "l Y-m-d\n" );
}
?>

format( "l Y-m-d H:i:s\n" );
}
?>
--EXPECT--
Tuesday 2008-01-15
Tuesday 2008-02-19
Tuesday 2008-03-18
Tuesday 2008-04-15
Tuesday 2008-05-20
Tuesday 2008-06-17
Tuesday 2008-07-15
Tuesday 2008-08-19
Tuesday 2008-09-16
Tuesday 2008-10-21
Tuesday 2008-11-18
Tuesday 2008-12-16

Thursday 2008-01-31 00:00:00
Thursday 2008-02-28 00:00:00
Thursday 2008-03-27 00:00:00
Thursday 2008-04-24 00:00:00
Thursday 2008-05-29 00:00:00
Thursday 2008-06-26 00:00:00
Thursday 2008-07-31 00:00:00
Thursday 2008-08-28 00:00:00
Thursday 2008-09-25 00:00:00
Thursday 2008-10-30 00:00:00
Thursday 2008-11-27 00:00:00
Thursday 2008-12-25 00:00:00
Thursday 2009-01-29 00:00:00
Thursday 2009-02-26 00:00:00
Thursday 2009-03-26 00:00:00
Thursday 2009-04-30 00:00:00
Thursday 2009-05-28 00:00:00
Thursday 2009-06-25 00:00:00
Thursday 2009-07-30 00:00:00
Thursday 2009-08-27 00:00:00
Thursday 2009-09-24 00:00:00
Thursday 2009-10-29 00:00:00
Thursday 2009-11-26 00:00:00
Thursday 2009-12-31 00:00:00



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

[PHP-CVS] cvs: php-src /ext/date/lib tm2unixtime.c /ext/date/tests date_period.phpt

2008-08-05 Thread Derick Rethans

derick  Tue Aug  5 18:02:39 2008 UTC

  Added files: 
/php-src/ext/date/tests date_period.phpt 

  Modified files:  
/php-src/ext/date/lib   tm2unixtime.c 
  Log:
  - Fixed a bug that caused miscalculations with the "last  of 
month" relative time string.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/tm2unixtime.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/date/lib/tm2unixtime.c
diff -u php-src/ext/date/lib/tm2unixtime.c:1.28 
php-src/ext/date/lib/tm2unixtime.c:1.29
--- php-src/ext/date/lib/tm2unixtime.c:1.28 Tue Jul  8 17:56:36 2008
+++ php-src/ext/date/lib/tm2unixtime.c  Tue Aug  5 18:02:39 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: tm2unixtime.c,v 1.28 2008/07/08 17:56:36 derick Exp $ */
+/* $Id: tm2unixtime.c,v 1.29 2008/08/05 18:02:39 derick Exp $ */
 
 #include "timelib.h"
 
@@ -277,6 +277,7 @@
break;
}
}
+   do_normalize(time);
 }
 
 static timelib_sll do_years(timelib_sll year)

http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_period.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/date_period.phpt
+++ php-src/ext/date/tests/date_period.phpt
--TEST--
DatePeriod
--INI--
date.timezone=UTC
--FILE--
modify( "3 tuesday" )->format( "l Y-m-d\n" );
}
?>

format( "l Y-m-d H:i:s\n" );
}
?>
--EXPECT--
Tuesday 2008-01-15
Tuesday 2008-02-19
Tuesday 2008-03-18
Tuesday 2008-04-15
Tuesday 2008-05-20
Tuesday 2008-06-17
Tuesday 2008-07-15
Tuesday 2008-08-19
Tuesday 2008-09-16
Tuesday 2008-10-21
Tuesday 2008-11-18
Tuesday 2008-12-16

Thursday 2008-01-31 00:00:00
Thursday 2008-02-28 00:00:00
Thursday 2008-03-27 00:00:00
Thursday 2008-04-24 00:00:00
Thursday 2008-05-29 00:00:00
Thursday 2008-06-26 00:00:00
Thursday 2008-07-31 00:00:00
Thursday 2008-08-28 00:00:00
Thursday 2008-09-25 00:00:00
Thursday 2008-10-30 00:00:00
Thursday 2008-11-27 00:00:00
Thursday 2008-12-25 00:00:00
Thursday 2009-01-29 00:00:00
Thursday 2009-02-26 00:00:00
Thursday 2009-03-26 00:00:00
Thursday 2009-04-30 00:00:00
Thursday 2009-05-28 00:00:00
Thursday 2009-06-25 00:00:00
Thursday 2009-07-30 00:00:00
Thursday 2009-08-27 00:00:00
Thursday 2009-09-24 00:00:00
Thursday 2009-10-29 00:00:00
Thursday 2009-11-26 00:00:00
Thursday 2009-12-31 00:00:00



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mcrypt config.w32

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 17:20:11 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mcrypt config.w32 
  Log:
  - MFH: not shared
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/config.w32?r1=1.2.8.2&r2=1.2.8.3&diff_format=u
Index: php-src/ext/mcrypt/config.w32
diff -u php-src/ext/mcrypt/config.w32:1.2.8.2 
php-src/ext/mcrypt/config.w32:1.2.8.3
--- php-src/ext/mcrypt/config.w32:1.2.8.2   Mon Aug  4 21:39:44 2008
+++ php-src/ext/mcrypt/config.w32   Tue Aug  5 17:20:10 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2.8.2 2008/08/04 21:39:44 pajoye Exp $
+// $Id: config.w32,v 1.2.8.3 2008/08/05 17:20:10 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("mcrypt", "mcrypt support", "no");
@@ -9,7 +9,7 @@
CHECK_LIB('libmcrypt_a.lib;libmcrypt.lib', 'mcrypt') &&
CHECK_LIB('Advapi32.lib', 'mcrypt')
) {
-   EXTENSION('mcrypt', 'mcrypt.c');
+   EXTENSION('mcrypt', 'mcrypt.c', false);
AC_DEFINE('HAVE_LIBMCRYPT', 1);
AC_DEFINE('HAVE_LIBMCRYPT24', 1);
} else {



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

[PHP-CVS] cvs: php-src /ext/mcrypt config.w32

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 17:19:33 2008 UTC

  Modified files:  
/php-src/ext/mcrypt config.w32 
  Log:
   - not shared
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/config.w32?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mcrypt/config.w32
diff -u php-src/ext/mcrypt/config.w32:1.4 php-src/ext/mcrypt/config.w32:1.5
--- php-src/ext/mcrypt/config.w32:1.4   Mon Aug  4 21:39:08 2008
+++ php-src/ext/mcrypt/config.w32   Tue Aug  5 17:19:32 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4 2008/08/04 21:39:08 pajoye Exp $
+// $Id: config.w32,v 1.5 2008/08/05 17:19:32 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("mcrypt", "mcrypt support", "no");
@@ -9,7 +9,7 @@
CHECK_LIB('libmcrypt_a.lib;libmcrypt.lib', 'mcrypt') &&
CHECK_LIB('Advapi32.lib', 'mcrypt')
) {
-   EXTENSION('mcrypt', 'mcrypt.c');
+   EXTENSION('mcrypt', 'mcrypt.c', false);
AC_DEFINE('HAVE_LIBMCRYPT', 1);
AC_DEFINE('HAVE_LIBMCRYPT24', 1);
} else {



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

[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 16:25:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcrun-tests.php 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.41&r2=1.226.2.37.2.35.2.42&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.41 
php-src/run-tests.php:1.226.2.37.2.35.2.42
--- php-src/run-tests.php:1.226.2.37.2.35.2.41  Sat Aug  2 13:39:42 2008
+++ php-src/run-tests.php   Tue Aug  5 16:25:42 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.41 2008/08/02 13:39:42 felipe Exp $ 
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.42 2008/08/05 16:25:42 jani Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -231,7 +231,7 @@
settings2array($ini_overwrites, $info_params);
settings2params($info_params);
$php_info = `$php $pass_options $info_params "$info_file"`;
-   define('TESTED_PHP_VERSION', `$php -r "echo PHP_VERSION;"`);
+   define('TESTED_PHP_VERSION', `$php -n -r "echo PHP_VERSION;"`);
 
if ($php_cgi && $php != $php_cgi) {
$php_info_cgi = `$php_cgi $pass_options $info_params -q 
"$info_file"`;
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.35.2.41 
$' . "\n";
+   echo '$Revision: 1.226.2.37.2.35.2.42 
$' . "\n";
exit(1);
 
default:



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

[PHP-CVS] cvs: php-src / run-tests.php

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 16:25:31 2008 UTC

  Modified files:  
/php-srcrun-tests.php 
  Log:
  - No need to load any php.ini here
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.372&r2=1.373&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.372 php-src/run-tests.php:1.373
--- php-src/run-tests.php:1.372 Sat Aug  2 13:39:26 2008
+++ php-src/run-tests.php   Tue Aug  5 16:25:31 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.372 2008/08/02 13:39:26 felipe Exp $ */
+/* $Id: run-tests.php,v 1.373 2008/08/05 16:25:31 jani Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -231,7 +231,7 @@
settings2array($ini_overwrites, $info_params);
settings2params($info_params);
$php_info = `$php $pass_options $info_params "$info_file"`;
-   define('TESTED_PHP_VERSION', `$php -r "echo PHP_VERSION;"`);
+   define('TESTED_PHP_VERSION', `$php -n -r "echo PHP_VERSION;"`);
 
if ($php_cgi && $php != $php_cgi) {
$php_info_cgi = `$php_cgi $pass_options $info_params -q 
"$info_file"`;
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.372 $' . "\n";
+   echo '$Revision: 1.373 $' . "\n";
exit(1);
 
default:



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

Re: [PHP-CVS] cvs: php-src /ext/pcntl config.m4 pcntl.c php_pcntl.h php_signal.c /ext/pcntl/tests 001.phpt 002.phpt pcntl_signal_dispatch.phpt signal_closure_handler.phpt

2008-08-05 Thread Arnaud Le Blanc

On Tuesday 05 August 2008 17:12:11 Jani Taskinen wrote:
> jani  Tue Aug  5 15:12:11 2008 UTC
>
>   Modified files:
> /php-src/ext/pcntlconfig.m4 pcntl.c php_pcntl.h php_signal.c
> /php-src/ext/pcntl/tests  001.phpt 002.phpt
>   pcntl_signal_dispatch.phpt
>   signal_closure_handler.phpt
>   Log:
>   - Portability fix. (si_fd seems to be linux only thing)

Thanks Jani. I had tested on FreeBSD before commiting that but it was not 
enough as it appears.

Regards,

Arnaud


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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c

2008-08-05 Thread Lukas Kahwe Smith



On 31.07.2008, at 09:18, Derick Rethans wrote:


On Mon, 28 Jul 2008, Olivier Hill wrote:

Indeed, I forgot to test that case. If I remember correctly, there  
was
no test cases for that function, so I'll fix this tonight and add  
some

tests.


I didn't see a commit - have you forgotten about it?

regards,
Derick



still not MFH'ed .. or?

regards,
Lukas Kahwe Smith
[EMAIL PROTECTED]




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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcntl config.m4 pcntl.c php_pcntl.h php_signal.c /ext/pcntl/tests 001.phpt 002.phpt pcntl_signal_dispatch.phpt signal_closure_handler.phpt

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 15:12:19 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pcntl  config.m4 pcntl.c php_pcntl.h php_signal.c 
/php-src/ext/pcntl/tests001.phpt 002.phpt 
pcntl_signal_dispatch.phpt 
signal_closure_handler.phpt 
  Log:
  MFH
  http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/config.m4?r1=1.10.8.1&r2=1.10.8.2&diff_format=u
Index: php-src/ext/pcntl/config.m4
diff -u php-src/ext/pcntl/config.m4:1.10.8.1 
php-src/ext/pcntl/config.m4:1.10.8.2
--- php-src/ext/pcntl/config.m4:1.10.8.1Tue Jul 29 16:59:10 2008
+++ php-src/ext/pcntl/config.m4 Tue Aug  5 15:12:19 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.10.8.1 2008/07/29 16:59:10 lbarnaud Exp $
+dnl $Id: config.m4,v 1.10.8.2 2008/08/05 15:12:19 jani Exp $
 dnl
 
 dnl Process Control (pcntl) extentsion --EXPERIMENTAL--
@@ -9,11 +9,9 @@
 [  --enable-pcntl  Enable experimental pcntl support (CLI/CGI only)])
 
 if test "$PHP_PCNTL" != "no"; then
- 
   AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: 
fork() not supported by this platform) ])
   AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ 
AC_MSG_ERROR(pcntl: fork() not supported by this platform) ])
   AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ 
AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ])
-  AC_CHECK_FUNCS(getpriority setpriority wait3 sigprocmask sigwaitinfo 
sigtimedwait)
-   
+  AC_CHECK_FUNCS([getpriority setpriority wait3 sigprocmask sigwaitinfo 
sigtimedwait])
   PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli)
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.8&r2=1.48.2.2.2.4.2.9&diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.8 
php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.9
--- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.8  Sat Aug  2 04:46:06 2008
+++ php-src/ext/pcntl/pcntl.c   Tue Aug  5 15:12:19 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: pcntl.c,v 1.48.2.2.2.4.2.8 2008/08/02 04:46:06 felipe Exp $ */
+/* $Id: pcntl.c,v 1.48.2.2.2.4.2.9 2008/08/05 15:12:19 jani Exp $ */
 
 #define PCNTL_DEBUG 0
 
@@ -35,8 +35,11 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_pcntl.h"
+#include "php_signal.h"
+#include "php_ticks.h"
 
 #if HAVE_GETPRIORITY || HAVE_SETPRIORITY || HAVE_WAIT3
+#include 
 #include 
 #include 
 #endif
@@ -864,12 +867,12 @@
 #ifdef SIGCHLD
case SIGCHLD:
add_assoc_long_ex(user_siginfo,   "status", 
sizeof("status"), siginfo.si_status);
-#ifdef si_utime
+# ifdef si_utime
add_assoc_double_ex(user_siginfo, "utime",  
sizeof("utime"),  siginfo.si_utime);
-#endif
-#ifdef si_stime
+# endif
+# ifdef si_stime
add_assoc_double_ex(user_siginfo, "stime",  
sizeof("stime"),  siginfo.si_stime);
-#endif
+# endif
add_assoc_long_ex(user_siginfo,   "pid",
sizeof("pid"),siginfo.si_pid);
add_assoc_long_ex(user_siginfo,   "uid",
sizeof("uid"),siginfo.si_uid);
break;
@@ -883,7 +886,9 @@
 #ifdef SIGPOLL
case SIGPOLL:
add_assoc_long_ex(user_siginfo, "band", 
sizeof("band"), siginfo.si_band);
+# ifdef si_fd
add_assoc_long_ex(user_siginfo, "fd",   
sizeof("fd"),   siginfo.si_fd);
+# endif
break;
 #endif
EMPTY_SWITCH_DEFAULT_CASE();
@@ -894,7 +899,7 @@
 }
 /* }}} */
 
-/* {{{ proto int sigwaitinfo(array set[, array &siginfo])
+/* {{{ proto int pcnlt_sigwaitinfo(array set[, array &siginfo])
Synchronously wait for queued signals */
 PHP_FUNCTION(pcntl_sigwaitinfo)
 {
@@ -902,7 +907,7 @@
 }
 /* }}} */
 
-/* {{{ proto int sigtimedwait(array set[, array &siginfo[, int seconds[, int 
nanoseconds]]])
+/* {{{ proto int pcntl_sigtimedwait(array set[, array &siginfo[, int seconds[, 
int nanoseconds]]])
Wait for queued signals */
 PHP_FUNCTION(pcntl_sigtimedwait)
 {
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/php_pcntl.h?r1=1.20.2.1.2.1.2.4&r2=1.20.2.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcntl/php_pcntl.h
diff -u php-src/ext/pcntl/php_pcntl.h:1.20.2.1.2.1.2.4 
php-src/ext/pcntl/php_pcntl.h:1.20.2.1.2.1.2.5
--- php-src/ext/pcntl/php_pcntl.h:1.20.2.1.2.1.2.4  Tue Jul 29 16:59:10 2008
+++ php-src/ext/pcntl/php_pcntl.h   Tue Aug  5 15:12:19 2008
@@ -16,14 +16,11 @@
+--+
  */
 
-/* $Id: php_pcntl.h,v 1.20.2.1.2.1.2.4 2008/07/29 16:59:10 lbarnaud Exp $ */
+/* $Id: php_pcntl.h,v 1.20.2.1.2.1.2.5 2008/08/05 15:12:19 jani Exp $ */
 
 #ifndef PHP_PCNTL_H
 #define PHP_PCNTL

[PHP-CVS] cvs: php-src /ext/pcntl config.m4 pcntl.c php_pcntl.h php_signal.c /ext/pcntl/tests 001.phpt 002.phpt pcntl_signal_dispatch.phpt signal_closure_handler.phpt

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 15:12:11 2008 UTC

  Modified files:  
/php-src/ext/pcntl  config.m4 pcntl.c php_pcntl.h php_signal.c 
/php-src/ext/pcntl/tests001.phpt 002.phpt 
pcntl_signal_dispatch.phpt 
signal_closure_handler.phpt 
  Log:
  - Portability fix. (si_fd seems to be linux only thing)
  http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/config.m4?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/pcntl/config.m4
diff -u php-src/ext/pcntl/config.m4:1.11 php-src/ext/pcntl/config.m4:1.12
--- php-src/ext/pcntl/config.m4:1.11Tue Jul 29 16:56:26 2008
+++ php-src/ext/pcntl/config.m4 Tue Aug  5 15:12:10 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.11 2008/07/29 16:56:26 lbarnaud Exp $
+dnl $Id: config.m4,v 1.12 2008/08/05 15:12:10 jani Exp $
 dnl
 
 dnl Process Control (pcntl) extentsion --EXPERIMENTAL--
@@ -9,11 +9,9 @@
 [  --enable-pcntl  Enable experimental pcntl support (CLI/CGI only)])
 
 if test "$PHP_PCNTL" != "no"; then
- 
   AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: 
fork() not supported by this platform) ])
   AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ 
AC_MSG_ERROR(pcntl: fork() not supported by this platform) ])
   AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ 
AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ])
-  AC_CHECK_FUNCS(getpriority setpriority wait3 sigprocmask sigwaitinfo 
sigtimedwait)
-   
+  AC_CHECK_FUNCS([getpriority setpriority wait3 sigprocmask sigwaitinfo 
sigtimedwait])
   PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli)
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.65&r2=1.66&diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.65 php-src/ext/pcntl/pcntl.c:1.66
--- php-src/ext/pcntl/pcntl.c:1.65  Sat Aug  2 04:40:44 2008
+++ php-src/ext/pcntl/pcntl.c   Tue Aug  5 15:12:10 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: pcntl.c,v 1.65 2008/08/02 04:40:44 felipe Exp $ */
+/* $Id: pcntl.c,v 1.66 2008/08/05 15:12:10 jani Exp $ */
 
 #define PCNTL_DEBUG 0
 
@@ -35,8 +35,11 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_pcntl.h"
+#include "php_signal.h"
+#include "php_ticks.h"
 
 #if HAVE_GETPRIORITY || HAVE_SETPRIORITY || HAVE_WAIT3
+#include 
 #include 
 #include 
 #endif
@@ -864,12 +867,12 @@
 #ifdef SIGCHLD
case SIGCHLD:
add_ascii_assoc_long_ex(user_siginfo,   
"status", sizeof("status"), siginfo.si_status);
-#ifdef si_utime
+# ifdef si_utime
add_ascii_assoc_double_ex(user_siginfo, 
"utime",  sizeof("utime"),  siginfo.si_utime);
-#endif
-#ifdef si_stime
+# endif
+# ifdef si_stime
add_ascii_assoc_double_ex(user_siginfo, 
"stime",  sizeof("stime"),  siginfo.si_stime);
-#endif
+# endif
add_ascii_assoc_long_ex(user_siginfo,   "pid",  
  sizeof("pid"),siginfo.si_pid);
add_ascii_assoc_long_ex(user_siginfo,   "uid",  
  sizeof("uid"),siginfo.si_uid);
break;
@@ -883,7 +886,9 @@
 #ifdef SIGPOLL
case SIGPOLL:
add_ascii_assoc_long_ex(user_siginfo, "band", 
sizeof("band"), siginfo.si_band);
+#ifdef si_fd
add_ascii_assoc_long_ex(user_siginfo, "fd",   
sizeof("fd"),   siginfo.si_fd);
+#endif
break;
 #endif
EMPTY_SWITCH_DEFAULT_CASE();
@@ -894,7 +899,7 @@
 }
 /* }}} */
 
-/* {{{ proto int sigwaitinfo(array set[, array &siginfo])
+/* {{{ proto int pcnlt_sigwaitinfo(array set[, array &siginfo])
Synchronously wait for queued signals */
 PHP_FUNCTION(pcntl_sigwaitinfo)
 {
@@ -902,7 +907,7 @@
 }
 /* }}} */
 
-/* {{{ proto int sigtimedwait(array set[, array &siginfo[, int seconds[, int 
nanoseconds]]])
+/* {{{ proto int pcntl_sigtimedwait(array set[, array &siginfo[, int seconds[, 
int nanoseconds]]])
Wait for queued signals */
 PHP_FUNCTION(pcntl_sigtimedwait)
 {
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/php_pcntl.h?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/pcntl/php_pcntl.h
diff -u php-src/ext/pcntl/php_pcntl.h:1.26 php-src/ext/pcntl/php_pcntl.h:1.27
--- php-src/ext/pcntl/php_pcntl.h:1.26  Tue Jul 29 16:56:26 2008
+++ php-src/ext/pcntl/php_pcntl.h   Tue Aug  5 15:12:10 2008
@@ -16,14 +16,11 @@
+--+
  */
 
-/* $Id: php_pcntl.h,v 1.26 2008/07/29 16:56:26 lbarnaud Exp $ */
+/* $Id: php_pcntl.h,v 1.27 2008/08/05 15:12:10 jani Exp $ */
 
 #ifndef PHP_PCNTL_H
 #define PHP_PCNTL_H
 
-#include 
-#include "php_signal.h"
-#include "php_ticks.h"
 extern zend_module_entry pcntl_module_entry;
 #define phpext_p

[PHP-CVS] cvs: php-src /ext/openssl openssl.c

2008-08-05 Thread Antony Dovgal

tony2001Tue Aug  5 14:58:57 2008 UTC

  Modified files:  
/php-src/ext/opensslopenssl.c 
  Log:
  fix typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.166&r2=1.167&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.166 php-src/ext/openssl/openssl.c:1.167
--- php-src/ext/openssl/openssl.c:1.166 Wed Jul 30 11:58:43 2008
+++ php-src/ext/openssl/openssl.c   Tue Aug  5 14:58:57 2008
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.166 2008/07/30 11:58:43 tony2001 Exp $ */
+/* $Id: openssl.c,v 1.167 2008/08/05 14:58:57 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3718,7 +3718,7 @@
char * outfilename; int outfilename_len;
char * extracertsfilename; int extracertsfilename_len;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!|ls", 
&ppinfilename, 
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!|lZ", 
&ppinfilename, 
&ppoutfilename, &zcert, &zprivkey, &zheaders, 
&flags, &ppextracertsfilename) == FAILURE) {
return;
}



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/math bug45712.phpt

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 12:37:09 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/mathbug45712.phpt 
  Log:
  MFH:- Add test for bug #45712
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/math/bug45712.phpt
+++ php-src/ext/standard/tests/math/bug45712.phpt
--TEST--
Bug #45712 (NaN/INF comparison)
--FILE--

--EXPECT--
float(NAN)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
float(INF)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/math bug45712.phpt

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 12:36:47 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/mathbug45712.phpt 
  Log:
  MFH:- Add test for bug #45712
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/math/bug45712.phpt
+++ php-src/ext/standard/tests/math/bug45712.phpt
--TEST--
Bug #45712 (NaN/INF comparison)
--FILE--

--EXPECT--
float(NAN)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
float(INF)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)



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

[PHP-CVS] cvs: php-src /ext/standard/tests/math bug45712.phpt

2008-08-05 Thread Jani Taskinen

janiTue Aug  5 12:36:22 2008 UTC

  Added files: 
/php-src/ext/standard/tests/mathbug45712.phpt 
  Log:
  - Add test for bug #45712
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/math/bug45712.phpt
+++ php-src/ext/standard/tests/math/bug45712.phpt
--TEST--
Bug #45712 (NaN/INF comparison)
--FILE--

--EXPECT--
float(NAN)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
float(INF)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build mkdist.php

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 11:47:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildmkdist.php 
  Log:
  - MFH: add dll path to mkdist default path
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.1&r2=1.13.4.1.2.2&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.1 
php-src/win32/build/mkdist.php:1.13.4.1.2.2
--- php-src/win32/build/mkdist.php:1.13.4.1.2.1 Fri Apr 11 21:57:58 2008
+++ php-src/win32/build/mkdist.php  Tue Aug  5 11:47:17 2008
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /win32/build mkdist.php

2008-08-05 Thread Pierre-Alain Joye

pajoye  Tue Aug  5 11:46:55 2008 UTC

  Modified files:  
/php-src/win32/buildmkdist.php 
  Log:
  - add dll path to mkdist default path
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.15&r2=1.16&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.15 php-src/win32/build/mkdist.php:1.16
--- php-src/win32/build/mkdist.php:1.15 Fri Apr 11 21:57:19 2008
+++ php-src/win32/build/mkdist.php  Tue Aug  5 11:46:55 2008
@@ -1,4 +1,4 @@
-http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file bug43008.phpt

2008-08-05 Thread Arnaud Le Blanc

lbarnaudTue Aug  5 10:10:39 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug43008.phpt 
  Log:
  MFH: Fixed test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43008.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/bug43008.phpt
diff -u php-src/ext/standard/tests/file/bug43008.phpt:1.1.2.1 
php-src/ext/standard/tests/file/bug43008.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/bug43008.phpt:1.1.2.1   Sat Aug  2 
06:35:41 2008
+++ php-src/ext/standard/tests/file/bug43008.phpt   Tue Aug  5 10:10:39 2008
@@ -1,5 +1,9 @@
 --TEST--
 Bug #43008 (php://filter uris ignore url encoded filternames and can't handle 
slashes)
+--SKIPIF--
+
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard/tests/file bug43008.phpt

2008-08-05 Thread Arnaud Le Blanc

lbarnaudTue Aug  5 10:09:12 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/filebug43008.phpt 
  Log:
  Fixed test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43008.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/bug43008.phpt
diff -u php-src/ext/standard/tests/file/bug43008.phpt:1.2 
php-src/ext/standard/tests/file/bug43008.phpt:1.3
--- php-src/ext/standard/tests/file/bug43008.phpt:1.2   Sat Aug  2 06:37:34 2008
+++ php-src/ext/standard/tests/file/bug43008.phpt   Tue Aug  5 10:09:12 2008
@@ -1,5 +1,9 @@
 --TEST--
 Bug #43008 (php://filter uris ignore url encoded filternames and can't handle 
slashes)
+--SKIPIF--
+
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

44 matches

Mail list logo