[PHP-CVS] com php-src: credits file for phpdbg: sapi/phpdbg/CREDITS

2013-12-23 Thread Joe Watkins 
Commit:265fdd91390a38deafbd193d4831c2e9db3b06fe
Author:Joe Watkins krak...@php.net Mon, 23 Dec 2013 22:36:30 +
Parents:   571ac343936dadc9673d2a94a8a8f36a606c8bb4
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=265fdd91390a38deafbd193d4831c2e9db3b06fe

Log:
credits file for phpdbg

Changed paths:
  A  sapi/phpdbg/CREDITS


Diff:
diff --git a/sapi/phpdbg/CREDITS b/sapi/phpdbg/CREDITS
new file mode 100644
index 000..036bafe
--- /dev/null
+++ b/sapi/phpdbg/CREDITS
@@ -0,0 +1,2 @@
+phpdbg
+Felipe Pena, Joe Watkins, Bob Weinand


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

[PHP-CVS] com php-src: test commit: CODING_STANDARDS

2013-12-16 Thread Joe Watkins 
Commit:d47cf9add1b106da70dae737a328038c2d3da7ad
Author:krakjoe joe.watk...@live.co.uk Mon, 16 Dec 2013 09:31:58 
+
Parents:   48dcc434887520dfb160336461e9563e2c7b1bfb
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d47cf9add1b106da70dae737a328038c2d3da7ad

Log:
test commit

Changed paths:
  M  CODING_STANDARDS


Diff:
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index 5fd3f9f..148a796 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -278,3 +278,4 @@ proto should still be included, describing which function 
is aliased.
 Backwards compatible functions and names should be maintained as long
 as the code can be reasonably be kept as part of the codebase. See
 /phpdoc/README for more information on documentation.
+


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

[PHP-CVS] com php-src: fix test: ext/mysqli/tests/mysqli_constants.phpt

2013-12-16 Thread Joe Watkins 
Commit:6fbcf693750d682b223660d3299a0b6864915acc
Author:Andrey Hristov and...@php.net Fri, 12 Oct 2012 10:35:45 
+0200
Parents:   0f3fb08a8dac2d39b6923bc23d6cfc71eac6fa9e
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6fbcf693750d682b223660d3299a0b6864915acc

Log:
fix test

Changed paths:
  M  ext/mysqli/tests/mysqli_constants.phpt


Diff:
diff --git a/ext/mysqli/tests/mysqli_constants.phpt 
b/ext/mysqli/tests/mysqli_constants.phpt
index 613dddf..0f87187 100644
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -125,6 +125,12 @@ require_once('skipifconnectfailure.inc');
$expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true;
}
 
+
+   /* First introduced in MySQL 6.0, backported to MySQL 5.5 */
+   if ($version = 50606 || $IS_MYSQLND) {
+   $expected_constants['MYSQLI_SERVER_PUBLIC_KEY'] = true;
+   }
+
if ($version  50002) {
$expected_constants = array_merge($expected_constants, array(
MYSQLI_TYPE_NEWDECIMAL= true,


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

[PHP-CVS] com php-src: constify: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_structs.h

2013-12-16 Thread Joe Watkins 
Commit:225792c5db2306727710d232effb86a3abf09feb
Author:Andrey Hristov and...@php.net Fri, 12 Oct 2012 10:20:09 
+0200
Parents:   7a7b2a06420138d0e0f18a898cb36d007196a922
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=225792c5db2306727710d232effb86a3abf09feb

Log:
constify

Changed paths:
  M  ext/mysqlnd/mysqlnd.c
  M  ext/mysqlnd/mysqlnd_auth.c
  M  ext/mysqlnd/mysqlnd_structs.h


Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index f5fe075..ad91212 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1924,7 +1924,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, 
free_reference)(MYSQLND_CONN_DATA * co
 
 /* {{{ mysqlnd_conn_data::get_state */
 static enum mysqlnd_connection_state
-MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, get_state)(MYSQLND_CONN_DATA * const 
conn TSRMLS_DC)
+MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, get_state)(const MYSQLND_CONN_DATA * 
const conn TSRMLS_DC)
 {
DBG_ENTER(mysqlnd_conn_data::get_state);
DBG_RETURN(conn-state);
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index f2c5adc..3cae693 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -581,6 +581,7 @@ mysqlnd_sha256_auth_get_auth_data(struct 
st_mysqlnd_authentication_plugin * self
 
 
if (conn-net-data-ssl) {
+   DBG_INF(simple clear text under SSL);
/* clear text under SSL */
*auth_data_len = passwd_len;
ret = malloc(passwd_len);
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 7f512b7..28def72 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -463,7 +463,7 @@ typedef enum_func_status
(*func_mysqlnd_conn_data__query_read_result_set_header)
 
 typedef MYSQLND_CONN_DATA *
(*func_mysqlnd_conn_data__get_reference)(MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
 typedef enum_func_status   
(*func_mysqlnd_conn_data__free_reference)(MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
-typedef enum mysqlnd_connection_state 
(*func_mysqlnd_conn_data__get_state)(MYSQLND_CONN_DATA * const conn TSRMLS_DC);
+typedef enum mysqlnd_connection_state 
(*func_mysqlnd_conn_data__get_state)(const MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
 typedef void   
(*func_mysqlnd_conn_data__set_state)(MYSQLND_CONN_DATA * const conn, enum 
mysqlnd_connection_state new_state TSRMLS_DC);
 
 typedef enum_func_status   
(*func_mysqlnd_conn_data__simple_command)(MYSQLND_CONN_DATA * conn, enum 
php_mysqlnd_server_command command, const zend_uchar * const arg, size_t 
arg_len, enum mysqlnd_packet_type ok_packet, zend_bool silent, zend_bool 
ignore_upsert_status TSRMLS_DC);


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

[PHP-CVS] com php-src: Merge branch '5.4': sapi/litespeed/lsapi_main.c

2013-12-16 Thread Joe Watkins 
Commit:1407b4a08085cc6b4b534baa2ca9eb40f8d39241
Author:George Wang gw...@php.net Fri, 12 Oct 2012 13:29:37 -0400
Parents:   6fbcf693750d682b223660d3299a0b6864915acc 
68e528a6bca59fcbcefeb49a6fcf992c8648475f
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1407b4a08085cc6b4b534baa2ca9eb40f8d39241

Log:
Merge branch '5.4'

* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228

Bugs:
https://bugs.php.net/63228

Changed paths:
  MM  sapi/litespeed/lsapi_main.c


Diff:
diff --cc sapi/litespeed/lsapi_main.c
index 5f4d2e6,7058342..338b8e9
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -413,25 -585,25 +413,25 @@@ static int processReq( TSRMLS_D 
  
  static void cli_usage( TSRMLS_D )
  {
 -static const char * usage =
 -Usage: php\n
 -  php -[b|c|h|i|q|s|v|?] [file] [args...]\n
 -  Run in LSAPI mode, only '-b', '-s' and '-c' are effective\n
 -  Run in Command Line Interpreter mode when parameters are 
specified\n
 -\n
 -  -b address:port|port Bind Path for external LSAPI Server 
mode\n
 -  -c path|file Look for php.ini file in this directory\n
 -  -hThis help\n
 -  -iPHP information\n
 -  -qQuiet-mode.  Suppress HTTP Header output.\n
 -  -sDisplay colour syntax highlighted source.\n
 -  -vVersion number\n
 -  -?This help\n
 -\n
 -  args...Arguments passed to script.\n;
 -php_output_startup();
 -php_output_activate(TSRMLS_C);
 -php_printf( %s, usage );
 +  static const char * usage =
 +  Usage: php\n
 +php -[b|c|h|i|q|s|v|?] [file] [args...]\n
 +Run in LSAPI mode, only '-b', '-s' and '-c' are effective\n
 +Run in Command Line Interpreter mode when parameters are 
specified\n
 +  \n
 +-b address:port|port Bind Path for external LSAPI Server 
mode\n
 +-c path|file Look for php.ini file in this directory\n
 +-hThis help\n
 +-iPHP information\n
 +-qQuiet-mode.  Suppress HTTP Header output.\n
 +-sDisplay colour syntax highlighted source.\n
 +-vVersion number\n
 +-?This help\n
 +  \n
 +args...  Arguments passed to script.\n;
 +  php_output_startup();
 +  php_output_activate(TSRMLS_C);
-   php_printf( usage );
++  php_printf( %s, usage );
  #ifdef PHP_OUTPUT_NEWAPI
  php_output_end_all(TSRMLS_C);
  #else


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