com php-src: Merge branch 'PHP-5.6': ext/sysvsem/sysvsem.c

From: Date: Wed, 10 Sep 2014 05:32:36 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/sysvsem/sysvsem.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81483@lists.php.net to get a copy of this message
Commit: 205b6b8a13f400d9f0ed5829056471df4f680bb4 Author: Matteo Beccati <mbeccati@php.net> Wed, 10 Sep 2014 07:32:36 +0200 Parents: 5b8243014f08d1822391ad54af8ae86f5be9a1da 0b648a424fd0ee7039ba4cb50b2bc64c2773b58a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=205b6b8a13f400d9f0ed5829056471df4f680bb4 Log: Merge branch 'PHP-5.6' * PHP-5.6: FR #67990 - Added nowait argument to sem_acquire Bugs: https://bugs.php.net/67990 Changed paths: MM ext/sysvsem/sysvsem.c Diff: diff --cc ext/sysvsem/sysvsem.c index 6f79485,fce70b9..7ae3628 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@@ -302,11 -303,17 +304,17 @@@ static void php_sysvsem_semop(INTERNAL_ sysvsem_sem *sem_ptr; struct sembuf sop; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg_id) == FAILURE) { - return; + if (acquire) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|b", &arg_id, &nowait) == FAILURE) { + return; + } + } else { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg_id) == FAILURE) { + return; + } } - ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, &arg_id, -1, "SysV semaphore", php_sysvsem_module.le_sem); + ZEND_FETCH_RESOURCE(sem_ptr, sysvsem_sem *, arg_id, -1, "SysV semaphore", php_sysvsem_module.le_sem); if (!acquire && sem_ptr->count == 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "SysV semaphore %ld (key 0x%x) is not currently acquired", Z_LVAL_P(arg_id), sem_ptr->key);

« previous php.cvs (#81483) next »