[PHP-CVS] com php-src: Prepare for next release: ext/oci8/package.xml ext/oci8/php_oci8.h

2013-09-27 Thread Christopher Jones
Commit:0a3ee7b26bfe17a6536b2dd8b16febc8b4b55d4d
Author:Christopher Jones  Fri, 27 Sep 2013 17:16:02 
-0700
Parents:   9b9eaba0834a0f985290304187189d0e33834b30
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0a3ee7b26bfe17a6536b2dd8b16febc8b4b55d4d

Log:
Prepare for next release

Changed paths:
  M  ext/oci8/package.xml
  M  ext/oci8/php_oci8.h


Diff:
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index cd6bb04..1161b03 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -44,8 +44,8 @@ http://pear.php.net/dtd/package-2.0.xsd";>
  12:00:00
 
   
-   2.0.4
-   2.0.4
+   2.0.5
+   2.0.5
   
   
devel
@@ -53,8 +53,7 @@ http://pear.php.net/dtd/package-2.0.xsd";>
   
   http://www.php.net/license";>PHP
   
-Fix persistent memory usage with --enable-dtrace
-Export get_module() for Windows php_oci8_12c.dll
+   - no notes yet
   
  
   
@@ -455,6 +454,22 @@ Export get_module() for Windows php_oci8_12c.dll
 
 
   
+   2.0.4
+   2.0.4
+  
+  
+   devel
+   devel
+  
+  http://www.php.net/license";>PHP
+  
+Fix persistent memory usage with --enable-dtrace
+Export get_module() for Windows php_oci8_12c.dll
+  
+
+
+
+  
2.0.3
2.0.3
   
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 6d02eff..1ea0411 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.0.3-dev"
+#define PHP_OCI8_VERSION "2.0.5-dev"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: OCI8: Fix alloc function and DLL generation: ext/oci8/oci8.c ext/oci8/oci8_interface.c ext/oci8/package.xml

2013-09-27 Thread Christopher Jones
Commit:9b9eaba0834a0f985290304187189d0e33834b30
Author:Christopher Jones  Fri, 27 Sep 2013 17:00:41 
-0700
Parents:   aba30ce30676b6d73a2169b10311dfb07768630c
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9b9eaba0834a0f985290304187189d0e33834b30

Log:
OCI8: Fix alloc function and DLL generation

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/oci8_interface.c
  M  ext/oci8/package.xml


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index f04114d..6723c22 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -151,7 +151,7 @@ static sword php_oci_ping_init(php_oci_connection 
*connection, OCIError *errh TS
 /* }}} */
 
 /* {{{ dynamically loadable module stuff */
-#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G)
+#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G) || 
defined(COMPILE_DL_OCI8_12C)
 ZEND_GET_MODULE(oci8)
 #endif /* COMPILE_DL */
 /* }}} */
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 3fad90d..0f17f93 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1788,7 +1788,7 @@ PHP_FUNCTION(oci_set_client_identifier)
 
if (client_id) {
/* this long winded copy allows compatibility with older PHP 
versions */
-   connection->client_id = (char *)safe_emalloc(client_id_len+1, 
sizeof(char), connection->is_persistent);
+   connection->client_id = (char *)pemalloc(client_id_len+1, 
connection->is_persistent);
memcpy(connection->client_id, client_id, client_id_len);
connection->client_id[client_id_len] = '\0';
} else {
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 24ba635..cd6bb04 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -44,8 +44,8 @@ http://pear.php.net/dtd/package-2.0.xsd";>
  12:00:00
 
   
-   2.0.3
-   2.0.3
+   2.0.4
+   2.0.4
   
   
devel
@@ -53,9 +53,8 @@ http://pear.php.net/dtd/package-2.0.xsd";>
   
   http://www.php.net/license";>PHP
   
-Add the oci_set_client_identifier() value and statement structure pointer to 
several DTrace probes.
-Use 'phpoci' as the DTrace provider name since uniqueness is required by the 
Linux fasttrap module.
-Update Windows builds to create only php_oci8_12c.dll.
+Fix persistent memory usage with --enable-dtrace
+Export get_module() for Windows php_oci8_12c.dll
   
  
   
@@ -456,6 +455,23 @@ Update Windows builds to create only php_oci8_12c.dll.
 
 
   
+   2.0.3
+   2.0.3
+  
+  
+   devel
+   devel
+  
+  http://www.php.net/license";>PHP
+  
+Add the oci_set_client_identifier() value and statement structure pointer to 
several DTrace probes.
+Use 'phpoci' as the DTrace provider name since uniqueness is required by the 
Linux fasttrap module.
+Update Windows builds to create only php_oci8_12c.dll.
+  
+
+
+
+  
2.0.2
2.0.2
   


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] com php-src: Added function opcache_compile_file() to load PHP scripts into cache without execution.: NEWS ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_ac

2013-09-27 Thread Yasuo Ohgaki
Hi Dimtry,

On Fri, Sep 27, 2013 at 5:55 PM, Dmitry Stogov  wrote:

> Sorry, but I don't know the rails "eager loading" and didn't understand
> you request.


Thanks for reply, I'll play around with opcache_compifle_file() when I have
time.
If I have request, I'll send it internals.

Regards,

--
Yasuo Ohgaki
yohg...@ohgaki.net


[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: php.ini-development php.ini-production

2013-09-27 Thread Lior Kaplan
Commit:e98fc7de52ff7ddbcce77bd1bd9df146a25d6659
Author:Lior Kaplan  Fri, 27 Sep 2013 17:50:03 
+0200
Parents:   80346690ba0a13f8a2a924671aaed55f824839c3 
0ad0a2f56ea5f9822297fec8e2816751b9a4f653
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e98fc7de52ff7ddbcce77bd1bd9df146a25d6659

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add information about which INI file is which inside respective files

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Add information about which INI file is which inside respective files: php.ini-development php.ini-production

2013-09-27 Thread Lior Kaplan
Commit:0ad0a2f56ea5f9822297fec8e2816751b9a4f653
Author:Ondřej Surý  Fri, 27 Sep 2013 17:46:14 +0200
Committer: Lior Kaplan   Fri, 27 Sep 2013 17:46:14 
+0200
Parents:   7a1a1aec8c90fff8a24dc53d2232e22fbca3d39f
Branches:  PHP-5.4 PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0ad0a2f56ea5f9822297fec8e2816751b9a4f653

Log:
Add information about which INI file is which inside respective files

Changed paths:
  M  php.ini-development
  M  php.ini-production


Diff:
diff --git a/php.ini-development b/php.ini-development
index ba20bd3..b935f22 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-development INI file.
+
 ;;;
 ; Quick Reference ;
 ;;;
diff --git a/php.ini-production b/php.ini-production
index db48a8f..4ee7ac9 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-production INI file.
+
 ;;;
 ; Quick Reference ;
 ;;;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Removed references to "Zend Support": ext/opcache/zend_accelerator_util_funcs.c

2013-09-27 Thread Dmitry Stogov
Commit:80346690ba0a13f8a2a924671aaed55f824839c3
Author:Dmitry Stogov  Fri, 27 Sep 2013 14:01:07 
+0400
Parents:   f90483001236c863abe1070d05ee2214db5a0a97
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=80346690ba0a13f8a2a924671aaed55f824839c3

Log:
Removed references to "Zend Support"

Changed paths:
  M  ext/opcache/zend_accelerator_util_funcs.c


Diff:
diff --git a/ext/opcache/zend_accelerator_util_funcs.c 
b/ext/opcache/zend_accelerator_util_funcs.c
index 39b4c1f..894da63 100644
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@ -478,7 +478,7 @@ static void zend_hash_clone_methods(HashTable *ht, 
HashTable *source, zend_class
if (accel_xlat_get(new_entry->scope, new_ce) == 
SUCCESS) {
new_entry->scope = *new_ce;
} else {
-   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " 
class loading error, class %s, function %s. Please call Zend Support", 
ce->name, new_entry->function_name);
+   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " 
class loading error, class %s, function %s", ce->name, 
new_entry->function_name);
}
}
 
@@ -487,7 +487,7 @@ static void zend_hash_clone_methods(HashTable *ht, 
HashTable *source, zend_class
if (accel_xlat_get(new_entry->prototype, new_prototype) 
== SUCCESS) {
new_entry->prototype = *new_prototype;
} else {
-   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " 
class loading error, class %s, function %s. Please call Zend Support", 
ce->name, new_entry->function_name);
+   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " 
class loading error, class %s, function %s", ce->name, 
new_entry->function_name);
}
}
 
@@ -589,7 +589,7 @@ static void zend_hash_clone_prop_info(HashTable *ht, 
HashTable *source, zend_cla
} else if (accel_xlat_get(prop_info->ce, new_ce) == SUCCESS) {
prop_info->ce = *new_ce;
} else {
-   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME" class 
loading error, class %s, property %s. Please call Zend Support", ce->name, 
prop_info->name);
+   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME" class 
loading error, class %s, property %s", ce->name, prop_info->name);
}
 
p = p->pListNext;
@@ -621,7 +621,7 @@ static int 
zend_prepare_function_for_execution(zend_op_array *op_array)
if (accel_xlat_get(ce->handler, new_func) == SUCCESS) { \
ce->handler = *new_func; \
} else { \
-   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " class 
loading error, class %s. Please call Zend Support", ce->name); \
+   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " class 
loading error, class %s", ce->name); \
} \
} \
 }
@@ -710,7 +710,7 @@ static void zend_class_copy_ctor(zend_class_entry **pce)
if (accel_xlat_get(ce->parent, new_ce) == SUCCESS) {
ce->parent = *new_ce;
} else {
-   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME" class 
loading error, class %s. Please call Zend Support", ce->name);
+   zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME" class 
loading error, class %s", ce->name);
}
}


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] com php-src: Added function opcache_compile_file() to load PHP scripts into cache without execution.: NEWS ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_ac

2013-09-27 Thread Dmitry Stogov
On Fri, Sep 27, 2013 at 1:46 PM, Antony Dovgal  wrote:

> On 2013-09-27 12:48, Dmitry Stogov wrote:
>
>> Hi Antony,
>>
>> I'm not sure if switching from zend_error() to php_error_docref() would
>> improve usability.
>>
>
> Well, IIRC the only difference is that it generates nice links to the docs
> and you're about to have those.
>
> Also I'm not sure all the cases when E_ERROR is used are reasonable,
> shouldn't they be something else?
>
> ext/opcache/zend_accelerator_**util_funcs.c:481:
>  zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " class loading error, class
> %s, function %s. Please call Zend Support", ce->name,
> new_entry->function_name);
> ext/opcache/zend_accelerator_**util_funcs.c:490:
>  zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " class loading error, class
> %s, function %s. Please call Zend Support", ce->name,
> new_entry->function_name);
> ext/opcache/zend_accelerator_**util_funcs.c:592:
>  zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME" class loading error, class
> %s, property %s. Please call Zend Support", ce->name, prop_info->name);
> ext/opcache/zend_accelerator_**util_funcs.c:624:
>  zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME " class loading error, class
> %s. Please call Zend Support", ce->name); \
> ext/opcache/zend_accelerator_**util_funcs.c:713:
>  zend_error(E_ERROR, ACCELERATOR_PRODUCT_NAME" class loading error, class
> %s. Please call Zend Support", ce->name);
> ext/opcache/zend_accelerator_**util_funcs.c:874:
>  zend_error(E_ERROR, "Cannot redeclare %s() (previously declared in %s:%d)",
> ext/opcache/zend_accelerator_**util_funcs.c:879:
>  zend_error(E_ERROR, "Cannot redeclare %s()", function1->common.function_*
> *name);
> ext/opcache/zend_accelerator_**util_funcs.c:897:
>  zend_error(E_ERROR, "Cannot redeclare class %s", (*pce1)->name);
>
> E_RECOVERABLE_ERROR maybe?


No way. How are you going to "recover" from such errors?
The standard PHP compiler throws E_ERROR for last 3 cases, anyway.

Thanks. Dmitry.


Re: [PHP-CVS] com php-src: Added function opcache_compile_file() to load PHP scripts into cache without execution.: NEWS ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_ac

2013-09-27 Thread Antony Dovgal

On 2013-09-27 12:48, Dmitry Stogov wrote:

Hi Antony,

I'm not sure if switching from zend_error() to php_error_docref() would improve 
usability.


Well, IIRC the only difference is that it generates nice links to the docs and 
you're about to have those.

Also I'm not sure all the cases when E_ERROR is used are reasonable, shouldn't 
they be something else?

ext/opcache/zend_accelerator_util_funcs.c:481:  zend_error(E_ERROR, 
ACCELERATOR_PRODUCT_NAME " class loading error, class %s, function %s. Please call Zend 
Support", ce->name, new_entry->function_name);
ext/opcache/zend_accelerator_util_funcs.c:490:  zend_error(E_ERROR, 
ACCELERATOR_PRODUCT_NAME " class loading error, class %s, function %s. Please call Zend 
Support", ce->name, new_entry->function_name);
ext/opcache/zend_accelerator_util_funcs.c:592:  zend_error(E_ERROR, 
ACCELERATOR_PRODUCT_NAME" class loading error, class %s, property %s. Please call Zend 
Support", ce->name, prop_info->name);
ext/opcache/zend_accelerator_util_funcs.c:624:  zend_error(E_ERROR, 
ACCELERATOR_PRODUCT_NAME " class loading error, class %s. Please call Zend 
Support", ce->name); \
ext/opcache/zend_accelerator_util_funcs.c:713:  zend_error(E_ERROR, 
ACCELERATOR_PRODUCT_NAME" class loading error, class %s. Please call Zend 
Support", ce->name);
ext/opcache/zend_accelerator_util_funcs.c:874:  zend_error(E_ERROR, 
"Cannot redeclare %s() (previously declared in %s:%d)",
ext/opcache/zend_accelerator_util_funcs.c:879:  zend_error(E_ERROR, 
"Cannot redeclare %s()", function1->common.function_name);
ext/opcache/zend_accelerator_util_funcs.c:897:  zend_error(E_ERROR, "Cannot 
redeclare class %s", (*pce1)->name);

E_RECOVERABLE_ERROR maybe?


I'll remove reference to Zend Support :)
It, provably, came from an old private version.
Thanks for caching this.


Sure, that was obvious =)

--
Wbr,
Antony Dovgal
---
http://pinba.org - realtime profiling for PHP

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.h sapi/cgi/cgi_main.c

2013-09-27 Thread Dmitry Stogov
Commit:3eba8cf6739f987c111ea2276ada8d7caca1eb9b
Author:Dmitry Stogov  Fri, 27 Sep 2013 13:44:31 
+0400
Parents:   9ef4e5d23d331227cbc3dfed04f9702b8012e1ef 
f90483001236c863abe1070d05ee2214db5a0a97
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=3eba8cf6739f987c111ea2276ada8d7caca1eb9b

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added support for GNU Hurd. (Svante Signell)

Conflicts:
NEWS

Changed paths:
  MM  ext/opcache/ZendAccelerator.h
  MM  sapi/cgi/cgi_main.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Added support for GNU Hurd. (Svante Signell): NEWS ext/opcache/ZendAccelerator.h ext/opcache/config.m4 sapi/cgi/cgi_main.c

2013-09-27 Thread Dmitry Stogov
Commit:f90483001236c863abe1070d05ee2214db5a0a97
Author:Dmitry Stogov  Fri, 27 Sep 2013 13:43:25 
+0400
Parents:   ea0f832f1000a47553a483e52633377a0d37800f
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f90483001236c863abe1070d05ee2214db5a0a97

Log:
Added support for GNU Hurd. (Svante Signell)

Changed paths:
  M  NEWS
  M  ext/opcache/ZendAccelerator.h
  M  ext/opcache/config.m4
  M  sapi/cgi/cgi_main.c


Diff:
diff --git a/NEWS b/NEWS
index bdc0cd5..c03d319 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,7 @@ PHP   
 NEWS
 imap). (ryotakatsuki at gmail dot com)
 
 - OPcache:
+  . Added support for GNU Hurd. (Svante Signell)
   . Added function opcache_compile_file() to load PHP scripts into cache
 without execution. (Julien)
   . Fixed bug #65665 (Exception not properly caught when opcache enabled).
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index f223f12..b9d7ef3 100644
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -80,6 +80,9 @@
 # endif
 # include 
 #else
+# ifndef MAXPATHLEN
+#  define MAXPATHLEN 4096
+# endif
 # include 
 #endif
 
@@ -100,7 +103,7 @@ extern int lock_file;
 # elif defined(__svr4__)
 #  define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {type, whence, start, len}
-# elif defined(__linux__) || defined(__hpux)
+# elif defined(__linux__) || defined(__hpux) || defined(__GNU__)
 #  define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {type, whence, start, len, 0}
 # elif defined(_AIX)
@@ -111,6 +114,12 @@ extern int lock_file;
 #   define FLOCK_STRUCTURE(name, type, whence, start, len) \
struct flock name = {type, whence, start, len}
 #  endif
+# elif defined(HAVE_FLOCK_BSD)
+#  define FLOCK_STRUCTURE(name, type, whence, start, len) \
+   struct flock name = {start, len, -1, type, whence}
+# elif defined(HAVE_FLOCK_LINUX)
+#  define FLOCK_STRUCTURE(name, type, whence, start, len) \
+   struct flock name = {type, whence, start, len}
 # else
 #  error "Don't know how to define struct flock"
 # endif
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 1798fe1..60edeed 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -326,40 +326,42 @@ int main() {
 msg=yes,msg=no,msg=no)
   AC_MSG_RESULT([$msg])
 
-  AC_MSG_CHECKING(for known struct flock definition)
-  dnl Copied from ZendAccelerator.h
-  AC_TRY_RUN([
-#include 
-#include 
-
-#ifndef ZEND_WIN32
-extern int lock_file;
-
-# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || 
(defined(__APPLE__) && defined(__MACH__)/* Darwin */) || defined(__OpenBSD__) 
|| defined(__NetBSD__)
-#  define FLOCK_STRUCTURE(name, type, whence, start, len) \
-struct flock name = {start, len, -1, type, whence}
-# elif defined(__svr4__)
-#  define FLOCK_STRUCTURE(name, type, whence, start, len) \
-struct flock name = {type, whence, start, len}
-# elif defined(__linux__) || defined(__hpux)
-#  define FLOCK_STRUCTURE(name, type, whence, start, len) \
-struct flock name = {type, whence, start, len, 0}
-# elif defined(_AIX)
-#  if defined(_LARGE_FILES) || defined(__64BIT__)
-#   define FLOCK_STRUCTURE(name, type, whence, start, len) \
-struct flock name = {type, whence, 0, 0, 0, start, len }
-#  else
-#   define FLOCK_STRUCTURE(name, type, whence, start, len) \
-struct flock name = {type, whence, start, len}
-#  endif
-# else
-#  error "Don't know how to define struct flock"
-# endif
-#endif
-int main() { return 0; }
-],
-[AC_MSG_RESULT([done])],
-[AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set 
--enable-opcache=no])], [])
+flock_type=unknown
+AC_MSG_CHECKING("whether flock struct is linux ordered")
+AC_TRY_RUN([
+  #include 
+  struct flock lock = { 1, 2, 3, 4, 5 };
+  int main() { 
+if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && 
lock.l_len == 4) {
+   return 0;
+}
+return 1;
+  } 
+], [
+   flock_type=linux
+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
+AC_MSG_RESULT("yes")
+], AC_MSG_RESULT("no") )
+
+AC_MSG_CHECKING("whether flock struct is BSD ordered")
+AC_TRY_RUN([
+  #include 
+  struct flock lock = { 1, 2, 3, 4, 5 };
+  int main() { 
+if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && 
lock.l_whence == 5) {
+   return 0;
+}
+return 1;
+  } 
+], [
+   flock_type=bsd
+AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) 
+AC_MSG_RESULT("yes")
+], AC_MSG_RESULT("no") )
+
+if test "$flock_type" == "unknown"; then
+   AC_MSG_ERROR([Don't know how to define struct flock on this system[,] 
set --enable-opcache=no])
+fi
   
   PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \
diff -

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/pdo_dblib/dblib_driver.c

2013-09-27 Thread Derick Rethans
Commit:9ef4e5d23d331227cbc3dfed04f9702b8012e1ef
Author:Derick Rethans  Fri, 27 Sep 2013 
10:14:51 +0100
Parents:   5ac7c533a0334f384d1a74eed6172a3c8cc4ef49 
ea0f832f1000a47553a483e52633377a0d37800f
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9ef4e5d23d331227cbc3dfed04f9702b8012e1ef

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  ext/pdo_dblib/dblib_driver.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] com php-src: Added function opcache_compile_file() to load PHP scripts into cache without execution.: NEWS ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_ac

2013-09-27 Thread Dmitry Stogov
Hi Yasua,

Sorry, but I don't know the rails "eager loading" and didn't understand you
request.

Thanks. Dmitry.


On Thu, Sep 26, 2013 at 5:46 AM, Yasuo Ohgaki  wrote:

> Hi Adam and Dmitry,
>
> On Thu, Sep 26, 2013 at 5:58 AM, Dmitry Stogov  wrote:
>
>> This function is going to be used only for cache warm-up (to load files
>> into cache without execution).
>> I don't think it may be useful in application code.
>> It 's not a big problem having warning and hiding it with @ if necessary.
>>
>
> Rails has feature called "eager loading" that loads all scripts at start up
> for better user experience with applications.
>
> This could be used implement the same feature in PHP if it's available
> in user space. Since this is ZEND_FUNCTION, I suppose it is available.
>
> Regards,
>
> --
> Yasuo Ohgaki
> yohg...@ohgaki.net
>


Re: [PHP-CVS] com php-src: Added function opcache_compile_file() to load PHP scripts into cache without execution.: NEWS ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_ac

2013-09-27 Thread Dmitry Stogov
Hi Antony,

I'm not sure if switching from zend_error() to php_error_docref() would
improve usability.
I'll remove reference to Zend Support :)
It, provably, came from an old private version.
Thanks for caching this.

Thanks. Dmitry.


On Thu, Sep 26, 2013 at 11:52 AM, Antony Dovgal  wrote:

> On 2013-09-26 00:58, Dmitry Stogov wrote:
>
>> This function is going to be used only for cache warm-up (to load files
>> into cache without execution).
>> I don't think it may be useful in application code.
>> It 's not a big problem having warning and hiding it with @ if necessary.
>>
>
> If it's already in ext/, why not use php_error_docref() instead of
> zend_error() and get rid of messages like "class loading error, class %s,
> function %s. Please call Zend Support" ?
>
> --
> Wbr,
> Antony Dovgal
> ---
> http://pinba.org - realtime profiling for PHP
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>