Skip to content

Commit

Permalink
Merge pull request #1698 from TysonAndre/php-7-header
Browse files Browse the repository at this point in the history
Remove "PHP Version 5" comment section
  • Loading branch information
yatsukhnenko committed Jan 14, 2020
2 parents 7a79ad9 + 0ef488f commit 2d39b48
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 18 deletions.
6 changes: 2 additions & 4 deletions php_redis.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
Expand Down Expand Up @@ -263,15 +261,15 @@ PHP_MSHUTDOWN_FUNCTION(redis);
PHP_MINFO_FUNCTION(redis);

/* Redis response handler function callback prototype */
typedef void (*ResultCallback)(INTERNAL_FUNCTION_PARAMETERS,
typedef void (*ResultCallback)(INTERNAL_FUNCTION_PARAMETERS,
RedisSock *redis_sock, zval *z_tab, void *ctx);

PHP_REDIS_API int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);

PHP_REDIS_API int redis_response_enqueued(RedisSock *redis_sock);

PHP_REDIS_API int redis_sock_read_multibulk_multi_reply_loop(
INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab,
INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab,
int numElems);

extern zend_module_entry redis_module_entry;
Expand Down
2 changes: 0 additions & 2 deletions redis.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/* -*- Mode: C; tab-width: 4 -*- */
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
Expand Down
2 changes: 0 additions & 2 deletions redis_array.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
Expand Down
4 changes: 1 addition & 3 deletions redis_array_impl.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
Expand Down Expand Up @@ -1196,7 +1194,7 @@ zval_rehash_callback(zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache,

z_cb->params = z_args;
z_cb->retval = z_ret;

z_cb->no_separation = 0;
z_cb->param_count = 2;

Expand Down
2 changes: 0 additions & 2 deletions redis_cluster.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
Expand Down
2 changes: 0 additions & 2 deletions redis_commands.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/* -*- Mode: C; tab-width: 4 -*- */
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
Expand Down
4 changes: 1 addition & 3 deletions redis_session.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/* -*- Mode: C; tab-width: 4 -*- */
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
Expand Down Expand Up @@ -587,7 +585,7 @@ PS_CREATE_SID_FUNC(redis)

if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);
pool->lock_status.session_key = redis_session_key(redis_sock, ZSTR_VAL(sid), ZSTR_LEN(sid));

if (lock_acquire(redis_sock, &pool->lock_status) == SUCCESS) {
return sid;
}
Expand Down

0 comments on commit 2d39b48

Please sign in to comment.