Merge pull request #2 from stuartjing/master

format code
rryqszq4 · Aug 4, 2016 · 5f4553c · 5f4553c
2 parents 713f5c0 + 3f64ae1
commit 5f4553c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/ngx_http_php_core.c b/src/ngx_http_php_core.c
@@ -366,6 +366,7 @@ void ngx_http_php_code_register_server_variables(zval *track_vars_array TSRMLS_D
 	server_address.len = NGX_SOCKADDR_STRLEN;
 	server_address.data = server_addr;
 	if (ngx_connection_local_sockaddr(r->connection, &server_address, 0) != NGX_OK) {
+
 	}
 	php_register_variable_safe("SERVER_ADDR", (char *)server_address.data, server_address.len, track_vars_array TSRMLS_CC);
 

diff --git a/src/php/php_ngx_location.c b/src/php/php_ngx_location.c
@@ -318,8 +318,7 @@ PHP_METHOD(ngx_location, capture)
     char *uri_str;
     int uri_len;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &uri_str, &uri_len) == FAILURE)
-    {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &uri_str, &uri_len) == FAILURE){
         return ;
     }
 
@@ -366,8 +365,7 @@ PHP_METHOD(ngx_location, capture_multi)
     zval *uri_arr;
     zval *result;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &uri_arr) == FAILURE)
-    {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &uri_arr) == FAILURE){
         return ;
     }
 

diff --git a/src/php/php_ngx_socket_tcp.c b/src/php/php_ngx_socket_tcp.c
@@ -35,8 +35,7 @@ PHP_METHOD(ngx_socket_tcp, connect)
     int host_len, port;
     zval *options = NULL;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|la", &host_str, &host_len, &options) == FAILURE)
-    {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|la", &host_str, &host_len, &options) == FAILURE){
         RETURN_NULL();
     }
 }

diff --git a/travis/compile.sh b/travis/compile.sh
@@ -73,6 +73,7 @@ if [ $? -eq 0 ];then
 	echo "nginx install ... done"
 	echo "ngx_php compile success."
 else 
+	echo "ngx_php compile failed.Contact author.You can Join QQ 558795330(ngx_php) ."
 	exit 1
 fi
 #echo "nginx install ... done"

diff --git a/utils/test.sh b/utils/test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#init path 
 export PATH=/usr/local/nginx_php_dev/sbin:$PATH
 cd /usr/local/nginx_php_dev/
 prove -r t