Skip to content

Commit

Permalink
Merge pull request #828 from sjinks/issue-810
Browse files Browse the repository at this point in the history
Fix for #810 rebased against 1.2.1
  • Loading branch information
Phalcon committed Jul 11, 2013
2 parents 412289e + 2d9b4e1 commit 9813b6e
Show file tree
Hide file tree
Showing 8 changed files with 211,974 additions and 213,899 deletions.
142,948 changes: 71,147 additions & 71,801 deletions build/32bits/phalcon.c

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions build/32bits/phalcon.h
Original file line number Diff line number Diff line change
Expand Up @@ -7978,13 +7978,25 @@ zend_class_entry *phalcon_kernel_ce;
PHALCON_INIT_CLASS(Phalcon_Kernel);

static PHP_METHOD(Phalcon_Kernel, preComputeHashKey);
static PHP_METHOD(Phalcon_Kernel, preComputeHashKey32);
static PHP_METHOD(Phalcon_Kernel, preComputeHashKey64);

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_kernel_precomputehashkey, 0, 0, 1)
ZEND_ARG_INFO(0, arrKey)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_kernel_precomputehashkey32, 0, 0, 1)
ZEND_ARG_INFO(0, arrKey)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_kernel_precomputehashkey64, 0, 0, 1)
ZEND_ARG_INFO(0, arrKey)
ZEND_END_ARG_INFO()

PHALCON_INIT_FUNCS(phalcon_kernel_method_entry){
PHP_ME(Phalcon_Kernel, preComputeHashKey, arginfo_phalcon_kernel_precomputehashkey, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Kernel, preComputeHashKey32, arginfo_phalcon_kernel_precomputehashkey32, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Kernel, preComputeHashKey64, arginfo_phalcon_kernel_precomputehashkey64, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_FE_END
};

Expand Down
139,930 changes: 69,638 additions & 70,292 deletions build/64bits/phalcon.c

Large diffs are not rendered by default.

Loading

0 comments on commit 9813b6e

Please sign in to comment.