Skip to content

missing EXTENSION directive #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

missing EXTENSION directive #758

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9fa0dbf
missing EXTENSION directive
pierrejoye Mar 11, 2016
018c5af
fix build, declaration must be first in context
pierrejoye Mar 12, 2016
ea4172f
fix build, declaration must be first in context
pierrejoye Mar 12, 2016
e89913e
include usleep def on win when necessary (still need usleep implement…
pierrejoye Mar 12, 2016
205bd03
fix export, add include for gettimeofday and usleep
pierrejoye Mar 12, 2016
393435f
declarations must be first in context
pierrejoye Mar 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
declarations must be first in context
  • Loading branch information
@pierrejoye
pierrejoye committed Mar 12, 2016
commit 393435f6dc3e6be9dd90e8d76ef34f7607c49a2f
7 changes: 4 additions & 3 deletions redis_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,12 @@ PHP_REDIS_API redis_pool_member *
redis_pool_get_sock(redis_pool *pool, const char *key TSRMLS_DC) {

unsigned int pos, i;
redis_pool_member *rpm;

memcpy(&pos, key, sizeof(pos));
pos %= pool->totalWeight;

redis_pool_member *rpm = pool->head;
rpm = pool->head;

for(i = 0; i < pool->totalWeight;) {
if(pos >= i && pos < i + rpm->weight) {
Expand Down Expand Up @@ -192,7 +194,7 @@ PS_OPEN_FUNC(redis)
php_url *url;
zval *params, **param;
int i, j, path_len;

RedisSock *redis_sock;
redis_pool *pool = redis_pool_new(TSRMLS_C);

for (i=0,j=0,path_len=strlen(save_path); i<path_len; i=j+1) {
Expand Down Expand Up @@ -280,7 +282,6 @@ PS_OPEN_FUNC(redis)
return FAILURE;
}

RedisSock *redis_sock;
if(url->host) {
redis_sock = redis_sock_create(url->host, strlen(url->host), url->port, timeout, persistent, persistent_id, retry_interval, 0);
} else { /* unix */
Expand Down