[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/openssl/xp_ssl.c
aharvey Mon, 13 Dec 2010 08:29:44 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306335
Log:
MFH: implement FR #53447 (Cannot disable SessionTicket extension for servers
that do not support it). Includes Tony's subsequent commit to fix a segfault.
Bug: http://bugs.php.net/53447 (Suspended) Cannot disable SessionTicket
extension for servers that do not support it
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-13 07:54:58 UTC (rev 306334)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-13 08:29:44 UTC (rev 306335)
@@ -27,6 +27,11 @@
. Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to
call libmysql). (Kalle, tre-php-net at crushedhat dot com)
+- OpenSSL extension:
+ . Implemented FR #53447 (Cannot disable SessionTicket extension for servers
+that do not support it) by adding a no_ticket SSL context option. (Adam,
+Tony)
+
- PDO Oracle driver:
. Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
ORACLE 10). (spatar at mail dot nnov dot ru)
Modified: php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c 2010-12-13 07:54:58 UTC
(rev 306334)
+++ php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c 2010-12-13 08:29:44 UTC
(rev 306335)
@@ -369,6 +369,18 @@
SSL_CTX_set_options(sslsock-ctx, SSL_OP_ALL);
+#if OPENSSL_VERSION_NUMBER = 0x0090806fL
+ {
+ zval **val;
+
+ if (stream-context SUCCESS == php_stream_context_get_option(
+ stream-context, ssl, no_ticket,
val)
+ zval_is_true(*val)) {
+ SSL_CTX_set_options(sslsock-ctx, SSL_OP_NO_TICKET);
+ }
+ }
+#endif
+
sslsock-ssl_handle = php_SSL_new_from_context(sslsock-ctx, stream
TSRMLS_CC);
if (sslsock-ssl_handle == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, failed to create
an SSL handle);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/imap/php_imap.c ext/imap/tests/bug53377.phpt
aharvey Mon, 13 Dec 2010 08:38:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306336
Log:
MFH: fixed bug #53377 (imap_mime_header_decode() doesn't ignore \t during long
MIME header unfolding).
Bug: http://bugs.php.net/53377 (Suspended) imap_mime_header_decode() doesn't
ignore \t during long MIME header unfolding
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
A php/php-src/branches/PHP_5_3/ext/imap/tests/bug53377.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-13 08:29:44 UTC (rev 306335)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-13 08:38:01 UTC (rev 306336)
@@ -16,6 +16,10 @@
(Ilia)
. Fixed bug #47435 (FILTER_FLAG_NO_RES_RANGE don't work with ipv6).
(Ilia, valli at icsurselva dot ch)
+
+- IMAP extension:
+ . Fixed bug #53377 (imap_mime_header_decode() doesn't ignore \t during long
+MIME header unfolding). (Adam)
- Intl extension:
. Fixed bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values).
Modified: php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
===
--- php/php-src/branches/PHP_5_3/ext/imap/php_imap.c2010-12-13 08:29:44 UTC
(rev 306335)
+++ php/php-src/branches/PHP_5_3/ext/imap/php_imap.c2010-12-13 08:38:01 UTC
(rev 306336)
@@ -4243,7 +4243,7 @@
}
offset = end_token+2;
- for (i = 0; (string[offset + i] == ' ')
|| (string[offset + i] == 0x0a) || (string[offset + i] == 0x0d); i++);
+ for (i = 0; (string[offset + i] == ' ')
|| (string[offset + i] == 0x0a) || (string[offset + i] == 0x0d) ||
(string[offset + i] == '\t'); i++);
if ((string[offset + i] == '=')
(string[offset + i + 1] == '?') (offset + i end)) {
offset += i;
}
Added: php/php-src/branches/PHP_5_3/ext/imap/tests/bug53377.phpt
===
--- php/php-src/branches/PHP_5_3/ext/imap/tests/bug53377.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/imap/tests/bug53377.phpt 2010-12-13
08:38:01 UTC (rev 306336)
@@ -0,0 +1,38 @@
+--TEST--
+Bug #53377 (imap_mime_header_decode() doesn't ignore \t during long MIME
header unfolding)
+--SKIPIF--
+?php
+if (!extension_loaded(imap)) {
+die(skip imap extension not available);
+}
+?
+--FILE--
+?php
+$s = =?UTF-8?Q?=E2=82=AC?=;
+$header = $s\n $s\n\t$s;
+
+var_dump(imap_mime_header_decode($header));
+--EXPECT--
+array(3) {
+ [0]=
+ object(stdClass)#1 (2) {
+[charset]=
+string(5) UTF-8
+[text]=
+string(3) €
+ }
+ [1]=
+ object(stdClass)#2 (2) {
+[charset]=
+string(5) UTF-8
+[text]=
+string(3) €
+ }
+ [2]=
+ object(stdClass)#3 (2) {
+[charset]=
+string(5) UTF-8
+[text]=
+string(3) €
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c trunk/ext/xmlrpc/tests/bug53493.phpt trunk/ext/xmlrpc/xm
kalleMon, 13 Dec 2010 09:52:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306339
Log:
Fixed bug #53493 (xmlrpc_decode should not be sensitive to leading whitespace)
Bug: http://bugs.php.net/53493 (Assigned) xmlrpc_decode should not be sensitive
to leading whitespace
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
A php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt
U php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
A php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt
U php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-13 09:04:07 UTC (rev 306338)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-13 09:52:05 UTC (rev 306339)
@@ -51,6 +51,10 @@
- Streams:
. Implemented FR #26158 (open arbitrary file descriptor with fopen).
(Gustavo)
+- XMLRPC-EPI:
+ . Fixed bug #53493 (xmlrpc_decode should not be sensitive to leading
+whitespace). (Kalle)
+
09 Dec 2010, PHP 5.3.4
- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
- Upgraded bundled PCRE to version 8.10. (Ilia)
Added: php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt
===
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt 2010-12-13
09:52:05 UTC (rev 306339)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #53493 (xmlrpc_decode should not be sensitive to leading whitespace)
+--FILE--
+?php
+$req = PHP_EOL .
+ '?xml version=1.0?methodResponseparamsparam' .
+ 'valuestringHello World/string/value/param' .
+ '/params/methodResponse';
+
+var_dump(xmlrpc_decode($req));
+echo Done\n;
+?
+--EXPECT--
+string(11) Hello World
+Done
Modified: php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c2010-12-13
09:04:07 UTC (rev 306338)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c2010-12-13
09:52:05 UTC (rev 306339)
@@ -67,6 +67,7 @@
#include php.h
#include ext/standard/info.h
+#include ext/standard/php_string.h
#include ext/date/php_date.h
#include php_ini.h
#include php_xmlrpc.h
@@ -844,7 +845,10 @@
}
if (return_value_used) {
- zval* retval = decode_request_worker(arg1, arg1_len, arg2_len ?
arg2 : NULL, NULL);
+ zval* retval;
+ char *trimmed = php_trim(arg1, arg1_len, NULL, 0, NULL, 1
TSRMLS_CC);
+
+ retval = decode_request_worker(trimmed, strlen(trimmed),
arg2_len ? arg2 : NULL, NULL);
if (retval) {
*return_value = *retval;
FREE_ZVAL(retval);
Added: php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt
===
--- php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt
(rev 0)
+++ php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt2010-12-13 09:52:05 UTC
(rev 306339)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #53493 (xmlrpc_decode should not be sensitive to leading whitespace)
+--FILE--
+?php
+$req = PHP_EOL .
+ '?xml version=1.0?methodResponseparamsparam' .
+ 'valuestringHello World/string/value/param' .
+ '/params/methodResponse';
+
+var_dump(xmlrpc_decode($req));
+echo Done\n;
+?
+--EXPECT--
+string(11) Hello World
+Done
Modified: php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c 2010-12-13 09:04:07 UTC
(rev 306338)
+++ php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c 2010-12-13 09:52:05 UTC
(rev 306339)
@@ -67,6 +67,7 @@
#include php.h
#include ext/standard/info.h
+#include ext/standard/php_string.h
#include ext/date/php_date.h
#include php_ini.h
#include php_xmlrpc.h
@@ -844,7 +845,10 @@
}
if (return_value_used) {
- zval* retval = decode_request_worker(arg1, arg1_len, arg2_len ?
arg2 : NULL, NULL);
+ zval* retval;
+ char *trimmed = php_trim(arg1, arg1_len, NULL, 0, NULL, 1
TSRMLS_CC);
+
+ retval = decode_request_worker(trimmed, strlen(trimmed),
arg2_len ? arg2 : NULL, NULL);
if (retval) {
*return_value = *retval;
FREE_ZVAL(retval);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c trunk/ext/xmlrpc/tests/bug53493.phpt trunk/ext/xmlrpc/xm
kalleMon, 13 Dec 2010 14:29:42 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306341
Log:
Revert fix for bug #53493 to be compliant with the XML specification
Bug: http://bugs.php.net/53493 (Assigned) xmlrpc_decode should not be sensitive
to leading whitespace
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
D php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt
U php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
D php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt
U php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-13 13:50:40 UTC (rev 306340)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-13 14:29:42 UTC (rev 306341)
@@ -51,9 +51,6 @@
- Streams:
. Implemented FR #26158 (open arbitrary file descriptor with fopen).
(Gustavo)
-- XMLRPC-EPI:
- . Fixed bug #53493 (xmlrpc_decode should not be sensitive to leading
-whitespace). (Kalle)
09 Dec 2010, PHP 5.3.4
- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
Deleted: php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt
===
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt 2010-12-13
13:50:40 UTC (rev 306340)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug53493.phpt 2010-12-13
14:29:42 UTC (rev 306341)
@@ -1,15 +0,0 @@
---TEST--
-Bug #53493 (xmlrpc_decode should not be sensitive to leading whitespace)
---FILE--
-?php
-$req = PHP_EOL .
- '?xml version=1.0?methodResponseparamsparam' .
- 'valuestringHello World/string/value/param' .
- '/params/methodResponse';
-
-var_dump(xmlrpc_decode($req));
-echo Done\n;
-?
---EXPECT--
-string(11) Hello World
-Done
Modified: php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c2010-12-13
13:50:40 UTC (rev 306340)
+++ php/php-src/branches/PHP_5_3/ext/xmlrpc/xmlrpc-epi-php.c2010-12-13
14:29:42 UTC (rev 306341)
@@ -845,10 +845,7 @@
}
if (return_value_used) {
- zval* retval;
- char *trimmed = php_trim(arg1, arg1_len, NULL, 0, NULL, 1
TSRMLS_CC);
-
- retval = decode_request_worker(trimmed, strlen(trimmed),
arg2_len ? arg2 : NULL, NULL);
+ zval* retval = decode_request_worker(arg1, arg1_len, arg2_len ?
arg2 : NULL, NULL);
if (retval) {
*return_value = *retval;
FREE_ZVAL(retval);
Deleted: php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt
===
--- php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt2010-12-13 13:50:40 UTC
(rev 306340)
+++ php/php-src/trunk/ext/xmlrpc/tests/bug53493.phpt2010-12-13 14:29:42 UTC
(rev 306341)
@@ -1,15 +0,0 @@
---TEST--
-Bug #53493 (xmlrpc_decode should not be sensitive to leading whitespace)
---FILE--
-?php
-$req = PHP_EOL .
- '?xml version=1.0?methodResponseparamsparam' .
- 'valuestringHello World/string/value/param' .
- '/params/methodResponse';
-
-var_dump(xmlrpc_decode($req));
-echo Done\n;
-?
---EXPECT--
-string(11) Hello World
-Done
Modified: php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c
===
--- php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c 2010-12-13 13:50:40 UTC
(rev 306340)
+++ php/php-src/trunk/ext/xmlrpc/xmlrpc-epi-php.c 2010-12-13 14:29:42 UTC
(rev 306341)
@@ -845,10 +845,7 @@
}
if (return_value_used) {
- zval* retval;
- char *trimmed = php_trim(arg1, arg1_len, NULL, 0, NULL, 1
TSRMLS_CC);
-
- retval = decode_request_worker(trimmed, strlen(trimmed),
arg2_len ? arg2 : NULL, NULL);
+ zval* retval = decode_request_worker(arg1, arg1_len, arg2_len ?
arg2 : NULL, NULL);
if (retval) {
*return_value = *retval;
FREE_ZVAL(retval);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c trunk/ext/standard/ftp_fopen_wrapper.c
iliaaMon, 13 Dec 2010 16:53:26 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306342
Log:
Fixed bug #48607 (fwrite() doesn't check reply from ftp server before exiting)
Bug: http://bugs.php.net/48607 (Verified) fwrite() doesn't check reply from ftp
server before exiting
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
U php/php-src/trunk/ext/standard/ftp_fopen_wrapper.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-12-13 14:29:42 UTC (rev 306341)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-12-13 16:53:26 UTC (rev 306342)
@@ -10,6 +10,8 @@
- Core:
. Fixed bug #48484 (array_product() always returns 0 for an empty array).
(Ilia)
+ . Fixed bug #48607 (fwrite() doesn't check reply from ftp server before
+exiting). (Ilia)
- Filter extension:
. Fixed bug #53150 (FILTER_FLAG_NO_RES_RANGE is missing some IP ranges).
Modified: php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
2010-12-13 14:29:42 UTC (rev 306341)
+++ php/php-src/branches/PHP_5_3/ext/standard/ftp_fopen_wrapper.c
2010-12-13 16:53:26 UTC (rev 306342)
@@ -98,13 +98,33 @@
static int php_stream_ftp_stream_close(php_stream_wrapper *wrapper, php_stream
*stream TSRMLS_DC)
{
php_stream *controlstream = (php_stream *)stream-wrapperdata;
+ int ret = 0;
if (controlstream) {
+ if (strpbrk(stream-mode, wa+)) {
+ char tmp_line[512];
+ int result;
+
+ /* For write modes close data stream first to signal
EOF to server */
+ stream-wrapperdata = NULL;
+ php_stream_close(stream);
+ stream = NULL;
+
+ result = GET_FTP_RESULT(controlstream);
+ if (result != 226 result != 250) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
FTP server error %d:%s, result, tmp_line);
+ ret = EOF;
+ }
+ }
+
php_stream_write_string(controlstream, QUIT\r\n);
php_stream_close(controlstream);
- stream-wrapperdata = NULL;
+ if (stream) {
+ stream-wrapperdata = NULL;
+ }
}
- return 0;
+
+ return ret;
}
/* }}} */
Modified: php/php-src/trunk/ext/standard/ftp_fopen_wrapper.c
===
--- php/php-src/trunk/ext/standard/ftp_fopen_wrapper.c 2010-12-13 14:29:42 UTC
(rev 306341)
+++ php/php-src/trunk/ext/standard/ftp_fopen_wrapper.c 2010-12-13 16:53:26 UTC
(rev 306342)
@@ -98,13 +98,33 @@
static int php_stream_ftp_stream_close(php_stream_wrapper *wrapper, php_stream
*stream TSRMLS_DC)
{
php_stream *controlstream = (php_stream *)stream-wrapperdata;
+ int ret = 0;
if (controlstream) {
+ if (strpbrk(stream-mode, wa+)) {
+ char tmp_line[512];
+ int result;
+
+ /* For write modes close data stream first to signal
EOF to server */
+ stream-wrapperdata = NULL;
+ php_stream_close(stream);
+ stream = NULL;
+
+ result = GET_FTP_RESULT(controlstream);
+ if (result != 226 result != 250) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
FTP server error %d:%s, result, tmp_line);
+ ret = EOF;
+ }
+ }
+
php_stream_write_string(controlstream, QUIT\r\n);
php_stream_close(controlstream);
- stream-wrapperdata = NULL;
+ if (stream) {
+ stream-wrapperdata = NULL;
+ }
}
- return 0;
+
+ return ret;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/session/ config.w32
pajoye Mon, 13 Dec 2010 18:07:08 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306343 Log: -ws Changed paths: U php/php-src/branches/PHP_5_3/ext/session/config.w32 Modified: php/php-src/branches/PHP_5_3/ext/session/config.w32 === --- php/php-src/branches/PHP_5_3/ext/session/config.w32 2010-12-13 16:53:26 UTC (rev 306342) +++ php/php-src/branches/PHP_5_3/ext/session/config.w32 2010-12-13 18:07:08 UTC (rev 306343) @@ -7,5 +7,3 @@ EXTENSION(session, session.c mod_files.c mod_mm.c mod_user.c, false /* never shared */); AC_DEFINE(HAVE_PHP_SESSION, 1, Session support); } - - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/zip/ php_zip.c
pajoye Mon, 13 Dec 2010 18:45:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306345 Log: - that should not have been applied Changed paths: U php/php-src/branches/PHP_5_3/ext/zip/php_zip.c Modified: php/php-src/branches/PHP_5_3/ext/zip/php_zip.c === --- php/php-src/branches/PHP_5_3/ext/zip/php_zip.c 2010-12-13 18:43:10 UTC (rev 306344) +++ php/php-src/branches/PHP_5_3/ext/zip/php_zip.c 2010-12-13 18:45:53 UTC (rev 306345) @@ -735,6 +735,8 @@ static zend_class_entry *zip_class_entry; static zend_object_handlers zip_object_handlers; +static HashTable zip_prop_handlers; + typedef int (*zip_read_int_t)(struct zip *za TSRMLS_DC); typedef char *(*zip_read_const_char_t)(struct zip *za, int *len TSRMLS_DC); typedef char *(*zip_read_const_char_from_ze_t)(ze_zip_object *obj TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js
kalleMon, 13 Dec 2010 20:46:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306346
Log:
* Don't print the shared headers table after enabling each extension (cleaner
configure output)
* Fix double slashes for directory targets in PHP_INSTALL_HEADERS()
Changed paths:
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2010-12-13 18:45:53 UTC (rev
306345)
+++ php/php-src/trunk/win32/build/confutils.js 2010-12-13 20:46:57 UTC (rev
306346)
@@ -1475,6 +1475,11 @@
STDOUT.WriteBlankLines(2);
+
+ STDOUT.WriteLine(Shared headers:);
+ output_as_table([Headers, Type, target], headers_install);
+ STDOUT.WriteBlankLines(2);
+
STDOUT.WriteLine(Enabled extensions:);
output_as_table([Extension, Mode], extensions_enabled.sort());
STDOUT.WriteBlankLines(2);
@@ -1867,7 +1872,7 @@
{
headers_list = headers_list.split(new RegExp(\\s+));
headers_list.sort();
- if (dir.length 0 dir.substr(dir.length - 1) != '/') {
+ if (dir.length 0 dir.substr(dir.length - 1) != '/'
dir.substr(dir.length - 1) != '\\') {
dir += '/';
}
dir = dir.replace(new RegExp(/, g), \\);
@@ -1878,7 +1883,7 @@
isdir = FSO.FolderExists(dir + src);
isfile = FSO.FileExists(dir + src);
if (isdir) {
- if (src.length 0 src.substr(src.length - 1) !=
'/') {
+ if (src.length 0 src.substr(src.length - 1) != '/'
src.substr(src.length - 1) != '\\') {
src += '\\';
}
headers_install[headers_install.length] = [dir + src,
'dir',''];
@@ -1892,7 +1897,6 @@
ERROR(Cannot find header + dir + src);
}
}
- output_as_table([Headers, Type, target], headers_install);
}
// for snapshot builders, this option will attempt to enable everything
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js
pls don't touch this code for now, and not in trunk I will merge the
changes from 5.3 soon. Thanks :)
On Mon, Dec 13, 2010 at 9:46 PM, Kalle Sommer Nielsen ka...@php.net wrote:
kalle Mon, 13 Dec 2010 20:46:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306346
Log:
* Don't print the shared headers table after enabling each extension (cleaner
configure output)
* Fix double slashes for directory targets in PHP_INSTALL_HEADERS()
Changed paths:
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2010-12-13 18:45:53 UTC (rev
306345)
+++ php/php-src/trunk/win32/build/confutils.js 2010-12-13 20:46:57 UTC (rev
306346)
@@ -1475,6 +1475,11 @@
STDOUT.WriteBlankLines(2);
+
+ STDOUT.WriteLine(Shared headers:);
+ output_as_table([Headers, Type, target], headers_install);
+ STDOUT.WriteBlankLines(2);
+
STDOUT.WriteLine(Enabled extensions:);
output_as_table([Extension, Mode], extensions_enabled.sort());
STDOUT.WriteBlankLines(2);
@@ -1867,7 +1872,7 @@
{
headers_list = headers_list.split(new RegExp(\\s+));
headers_list.sort();
- if (dir.length 0 dir.substr(dir.length - 1) != '/') {
+ if (dir.length 0 dir.substr(dir.length - 1) != '/'
dir.substr(dir.length - 1) != '\\') {
dir += '/';
}
dir = dir.replace(new RegExp(/, g), \\);
@@ -1878,7 +1883,7 @@
isdir = FSO.FolderExists(dir + src);
isfile = FSO.FileExists(dir + src);
if (isdir) {
- if (src.length 0 src.substr(src.length - 1) !=
'/') {
+ if (src.length 0 src.substr(src.length - 1) !=
'/' src.substr(src.length - 1) != '\\') {
src += '\\';
}
headers_install[headers_install.length] = [dir + src,
'dir',''];
@@ -1892,7 +1897,6 @@
ERROR(Cannot find header + dir + src);
}
}
- output_as_table([Headers, Type, target], headers_install);
}
// for snapshot builders, this option will attempt to enable everything
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ Makefile buildconf.js config.w32 configure.tail confutils.js
pajoye Mon, 13 Dec 2010 20:55:13 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306347
Log:
- phpize support merge from 5.3
Changed paths:
U php/php-src/trunk/win32/build/Makefile
U php/php-src/trunk/win32/build/buildconf.js
U php/php-src/trunk/win32/build/config.w32
U php/php-src/trunk/win32/build/configure.tail
U php/php-src/trunk/win32/build/confutils.js
Modified: php/php-src/trunk/win32/build/Makefile
===
--- php/php-src/trunk/win32/build/Makefile 2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/Makefile 2010-12-13 20:55:13 UTC (rev 306347)
@@ -152,12 +152,24 @@
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php $(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS)
# need to redirect, since INSTALL is a file in the root...
-install: really-install install-headers install-lib
+install: really-install install-devel install-lib
install-lib:
@if not exist $(PHP_PREFIX)\lib mkdir $(PHP_PREFIX)\lib nul
@copy $(BUILD_DIR)\$(PHPLIB) $(PHP_PREFIX)\lib /y nul
+install-devel: install-headers
+ @if not exist $(PHP_PREFIX)\script mkdir $(PHP_PREFIX)\script nul
+ @if not exist $(PHP_PREFIX)\build mkdir $(PHP_PREFIX)\build nul
+ @copy win32\build\confutils.js $(PHP_PREFIX)\script\ /y nul
+ @copy win32\build\configure.tail $(PHP_PREFIX)\script\ /y nul
+ @copy win32\build\config.w32.phpize.in $(PHP_PREFIX)\script\ /y nul
+ @copy win32\build\Makefile.phpize $(PHP_PREFIX)\script\ /y nul
+ @copy win32\build\phpize.bat $(PHP_PREFIX)\ /y nul
+ @copy win32\build\template.rc $(PHP_PREFIX)\build\ /y nul
+ @copy $(BUILD_DIR)\devel\config.phpize.js $(PHP_PREFIX)\script\ /y nul
+ @copy $(BUILD_DIR)\devel\phpize.js $(PHP_PREFIX)\script\ /y nul
+
really-install:
@if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX)
@echo Installing files under $(PHP_PREFIX)
@@ -166,5 +178,3 @@
@echo Registering event source with syslog (requires admin rights)
@echo It's okay for this step to fail:
-$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL)
-
-
Modified: php/php-src/trunk/win32/build/buildconf.js
===
--- php/php-src/trunk/win32/build/buildconf.js 2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/buildconf.js 2010-12-13 20:55:13 UTC (rev 306347)
@@ -209,6 +209,7 @@
// Write the head of the configure script
C.WriteLine(/* This file automatically generated from win32/build/confutils.js */);
+C.WriteLine(MODE_PHPIZE=false;);
C.Write(file_get_contents(win32/build/confutils.js));
// If project files were requested, pull in the code to generate them
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w32 2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/config.w32 2010-12-13 20:55:13 UTC (rev 306347)
@@ -204,6 +204,9 @@
if (PHP_ZTS == yes) {
ADD_FLAG(CFLAGS, /D ZTS=1);
+ ADD_FLAG(ZTS, 1);
+} else {
+ ADD_FLAG(ZTS, 0);
}
DEFINE(PHP_ZTS_ARCHIVE_POSTFIX, PHP_ZTS == yes ? '' : -nts);
@@ -356,7 +359,7 @@
ADD_SOURCES(win32, glob.c readdir.c \
registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c);
-PHP_INSTALL_HEADERS(, Zend/ TSRM/ main/ main/streams/);
+PHP_INSTALL_HEADERS(, Zend/ TSRM/ main/ main/streams/ win32/);
STDOUT.WriteBlankLines(1);
Modified: php/php-src/trunk/win32/build/configure.tail
===
--- php/php-src/trunk/win32/build/configure.tail 2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/configure.tail 2010-12-13 20:55:13 UTC (rev 306347)
@@ -2,7 +2,7 @@
// $Id$
// tail end of configure
-if (sapi_enabled.length 1) {
+if (!MODE_PHPIZE sapi_enabled.length 1) {
MESSAGE();
ERROR(No SAPI selected, please enable at least one SAPI.);
}
Modified: php/php-src/trunk/win32/build/confutils.js
===
--- php/php-src/trunk/win32/build/confutils.js 2010-12-13 20:46:57 UTC (rev 306346)
+++ php/php-src/trunk/win32/build/confutils.js 2010-12-13 20:55:13 UTC (rev 306347)
@@ -58,11 +58,18 @@
PROGRAM_FILES = C:\\Program Files;
}
-if (!FSO.FileExists(README.SVN-RULES)) {
- STDERR.WriteLine(Must be run from the root of the php source);
- WScript.Quit(10);
+if (MODE_PHPIZE) {
+ if (!FSO.FileExists(config.w32)) {
+ STDERR.WriteLine(Must be run from the root of the extension source);
+ WScript.Quit(10);
+ }
+} else {
+ if (!FSO.FileExists(README.SVN-RULES)) {
+ STDERR.WriteLine(Must be run from the root of the php source);
+ WScript.Quit(10);
+ }
}
-
+
var CWD = WshShell.CurrentDirectory;
if (typeof(CWD) == undefined) {
@@ -109,7 +116,9 @@
extension_include_code = ;
extension_module_ptrs =
[PHP-CVS] svn: /php/php-src/trunk/win32/build/ confutils.js
pajoye Mon, 13 Dec 2010 20:56:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306348 Log: - no need to diplay that Changed paths: U php/php-src/trunk/win32/build/confutils.js Modified: php/php-src/trunk/win32/build/confutils.js === --- php/php-src/trunk/win32/build/confutils.js 2010-12-13 20:55:13 UTC (rev 306347) +++ php/php-src/trunk/win32/build/confutils.js 2010-12-13 20:56:44 UTC (rev 306348) @@ -1516,11 +1516,6 @@ STDOUT.WriteBlankLines(2); - - STDOUT.WriteLine(Shared headers:); - output_as_table([Headers, Type, target], headers_install); - STDOUT.WriteBlankLines(2); - STDOUT.WriteLine(Enabled extensions:); output_as_table([Extension, Mode], extensions_enabled.sort()); STDOUT.WriteBlankLines(2); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/win32/build/ confutils.js
pajoye Mon, 13 Dec 2010 20:57:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=306349
Log:
- MFH trailing slashes detection
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-13
20:56:44 UTC (rev 306348)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-13
20:57:06 UTC (rev 306349)
@@ -1955,7 +1955,7 @@
{
headers_list = headers_list.split(new RegExp(\\s+));
headers_list.sort();
- if (dir.length 0 dir.substr(dir.length - 1) != '/') {
+ if (dir.length 0 dir.substr(dir.length - 1) != '/'
dir.substr(dir.length - 1) != '\\') {
dir += '/';
}
dir = dir.replace(new RegExp(/, g), \\);
@@ -1966,7 +1966,7 @@
isdir = FSO.FolderExists(dir + src);
isfile = FSO.FileExists(dir + src);
if (isdir) {
- if (src.length 0 src.substr(src.length - 1) !=
'/') {
+ if (src.length 0 src.substr(src.length - 1) != '/'
src.substr(src.length - 1) != '\\') {
src += '\\';
}
headers_install[headers_install.length] = [dir + src,
'dir',''];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/php.ini-development branches/PHP_5_3/php.ini-production trunk/php.ini-development trunk/php.ini-production
pajoye Mon, 13 Dec 2010 21:07:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306350 Log: -add a link to snmp install doc about the MIBS data, remove static or removed exts Changed paths: U php/php-src/branches/PHP_5_3/php.ini-development U php/php-src/branches/PHP_5_3/php.ini-production U php/php-src/trunk/php.ini-development U php/php-src/trunk/php.ini-production Modified: php/php-src/branches/PHP_5_3/php.ini-development === --- php/php-src/branches/PHP_5_3/php.ini-development2010-12-13 20:57:06 UTC (rev 306349) +++ php/php-src/branches/PHP_5_3/php.ini-development2010-12-13 21:07:13 UTC (rev 306350) @@ -972,7 +972,11 @@ ;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll + +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php ;extension=php_snmp.dll + ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll Modified: php/php-src/branches/PHP_5_3/php.ini-production === --- php/php-src/branches/PHP_5_3/php.ini-production 2010-12-13 20:57:06 UTC (rev 306349) +++ php/php-src/branches/PHP_5_3/php.ini-production 2010-12-13 21:07:13 UTC (rev 306350) @@ -971,7 +971,11 @@ ;extension=php_pgsql.dll ;extension=php_pspell.dll ;extension=php_shmop.dll + +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php ;extension=php_snmp.dll + ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll Modified: php/php-src/trunk/php.ini-development === --- php/php-src/trunk/php.ini-development 2010-12-13 20:57:06 UTC (rev 306349) +++ php/php-src/trunk/php.ini-development 2010-12-13 21:07:13 UTC (rev 306350) @@ -888,7 +888,11 @@ ;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll + +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php ;extension=php_snmp.dll + ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll Modified: php/php-src/trunk/php.ini-production === --- php/php-src/trunk/php.ini-production2010-12-13 20:57:06 UTC (rev 306349) +++ php/php-src/trunk/php.ini-production2010-12-13 21:07:13 UTC (rev 306350) @@ -859,7 +859,6 @@ ; ;extension=php_bz2.dll ;extension=php_curl.dll -;extension=php_dba.dll ;extension=php_fileinfo.dll ;extension=php_gd2.dll ;extension=php_gettext.dll @@ -870,8 +869,6 @@ ;extension=php_ldap.dll ;extension=php_mbstring.dll ;extension=php_exif.dll ; Must be after mbstring as it depends on it -;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_mysql.dll ;extension=php_mysqli.dll ;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client @@ -885,10 +882,13 @@ ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll + +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php ;extension=php_snmp.dll + ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/Makefile branches/PHP_5_3/win32/build/confutils.js trunk/win32/build/Makefile trunk/win32/build/confutils.js
pajoye Tue, 14 Dec 2010 02:55:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=306356 Log: - add nmake install-sdk (create the devel package) and related sub rules Changed paths: U php/php-src/branches/PHP_5_3/win32/build/Makefile U php/php-src/branches/PHP_5_3/win32/build/confutils.js U php/php-src/trunk/win32/build/Makefile U php/php-src/trunk/win32/build/confutils.js Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile === --- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 01:48:31 UTC (rev 306355) +++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-12-14 02:55:26 UTC (rev 306356) @@ -25,10 +25,12 @@ PHP_BUILD=$(PHP_BUILD) MCFILE=$(BUILD_DIR)\wsyslog.rc +BUILD_DIR_DEV_NAME=php-$(PHP_VERSION_STRING)-devel-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE) +BUILD_DIR_DEV=$(BUILD_DIR)\$(BUILD_DIR_DEV_NAME) all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) -build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) +build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV) !if $(RE2C) == generated_files: build_dirs Zend\zend_ini_parser.c \ @@ -85,10 +87,11 @@ $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL) -$(BUILD_DIR) $(BUILD_DIRS_SUB): +$(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV): @echo Recreating build dirs @if not exist $(BUILD_DIR) mkdir $(BUILD_DIR) @for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D NUL + @if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) NUL clean-sapi: @echo Cleaning SAPI @@ -140,10 +143,13 @@ cd ..\.. cd $(BUILD_DIR) -$(ZIP) -9 -q php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb + cd + cd + -$(ZIP) -9 -q -r php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip $(BUILD_DIR_DEV_NAME) cd ..\.. dist: all build-dist -snap: build-snap build-dist +snap: build-devel build-lib build-snap build-dist $(BUILD_DIR)\deplister.exe: win32\build\deplister.c $(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib @@ -152,24 +158,27 @@ $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php $(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS) # need to redirect, since INSTALL is a file in the root... -install: really-install install-devel install-lib +install: really-install install-sdk -install-lib: - @if not exist $(PHP_PREFIX)\lib mkdir $(PHP_PREFIX)\lib nul - @copy $(BUILD_DIR)\$(PHPLIB) $(PHP_PREFIX)\lib /y nul +build-lib: + @if not exist $(BUILD_DIR_DEV)\lib mkdir $(BUILD_DIR_DEV)\lib nul + @copy $(BUILD_DIR)\$(PHPLIB) $(BUILD_DIR_DEV)\lib /y nul -install-devel: install-headers - @if not exist $(PHP_PREFIX)\script mkdir $(PHP_PREFIX)\script nul - @if not exist $(PHP_PREFIX)\build mkdir $(PHP_PREFIX)\build nul - @copy win32\build\confutils.js $(PHP_PREFIX)\script\ /y nul - @copy win32\build\configure.tail $(PHP_PREFIX)\script\ /y nul - @copy win32\build\config.w32.phpize.in $(PHP_PREFIX)\script\ /y nul - @copy win32\build\Makefile.phpize $(PHP_PREFIX)\script\ /y nul - @copy win32\build\phpize.bat $(PHP_PREFIX)\ /y nul - @copy win32\build\template.rc $(PHP_PREFIX)\build\ /y nul - @copy $(BUILD_DIR)\devel\config.phpize.js $(PHP_PREFIX)\script\ /y nul - @copy $(BUILD_DIR)\devel\phpize.js $(PHP_PREFIX)\script\ /y nul +build-devel: build-headers build-lib + @if not exist $(BUILD_DIR_DEV)\script mkdir $(BUILD_DIR_DEV)\script nul + @if not exist $(BUILD_DIR_DEV)\build mkdir $(BUILD_DIR_DEV)\build nul + @copy win32\build\confutils.js $(BUILD_DIR_DEV)\script\ /y nul + @copy win32\build\configure.tail $(BUILD_DIR_DEV)\script\ /y nul + @copy win32\build\config.w32.phpize.in $(BUILD_DIR_DEV)\script\ /y nul + @copy win32\build\Makefile.phpize $(BUILD_DIR_DEV)\script\ /y nul + @copy win32\build\phpize.bat $(BUILD_DIR_DEV)\ /y nul + @copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y nul + @copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y nul + @copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y nul +install-sdk: build-devel + @xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK + really-install: @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) @echo Installing files under $(PHP_PREFIX) Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js === --- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14 01:48:31 UTC (rev 306355) +++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2010-12-14 02:55:26 UTC (rev 306356) @@ -1720,17 +1720,17 @@ MF.Write(TF.ReadAll()); - MF.WriteLine(install-headers:); - MF.WriteLine( @if not exist $(PHP_PREFIX)\\include mkdir $(PHP_PREFIX)\\include nul); - MF.WriteLine( @for %D in
