mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-09 12:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
72,121 Commits 505 Branches 1,389 Tags 848 MiB
5d4c691e51
Commit Graph

72121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ULF WENDEL
5d4c691e51 Merge branch 'PHP-5.4' 
* PHP-5.4:
  This won't make the test pass but now its at least one that shows no unnecessary error messages...
 2012-10-26 12:32:39 +02:00
ULF WENDEL
056ecf3201 This won't make the test pass but now its at least one that shows no unnecessary error messages... 2012-10-26 12:32:10 +02:00
Anthony Ferrara
db35ca4e54 Merge branch 'PHP-5.4' 2012-10-25 16:24:27 -04:00
Anthony Ferrara
c4ce96d073 News entry for CURL notice addition 2012-10-25 16:04:56 -04:00
John Jawed (JJ)
f68f31f121 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 16:00:02 -04:00
Anthony Ferrara
18da63e5be Merge in fix for bug 63363 (CURL silently accepts boolean true for SSL_VERIFYHOST 
Merge in a fix to raise a notice when a boolean true is passed into curl_setopt for CURLOPT_SSL_VERIFYHOST.
 2012-10-25 15:30:37 -04:00
John Jawed (JJ)
3b85d09de7 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 12:22:23 -07:00
Anatoliy Belsky
7b4a53e263 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #63297 Phar fails to write an openssl based signature
 2012-10-24 14:46:50 +02:00
Anatoliy Belsky
684f29a527 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63297 Phar fails to write an openssl based signature
 2012-10-24 14:46:28 +02:00
Anatoliy Belsky
a88379e03d Fixed bug #63297 Phar fails to write an openssl based signature 
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
 2012-10-24 13:38:44 +02:00
Anatoliy Belsky
071f217388 Merge branch 'PHP-5.4' 
* PHP-5.4:
  enabled libxpm for gd on windows
 2012-10-24 10:37:23 +02:00
Anatoliy Belsky
e3ac418309 enabled libxpm for gd on windows 2012-10-24 10:36:52 +02:00
Anatoliy Belsky
5054d77b75 Merge branch 'PHP-5.4' 
* PHP-5.4:
  enabled libxpm for gd on windows
 2012-10-24 10:35:52 +02:00
Anatoliy Belsky
3b7ee4dced Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  enabled libxpm for gd on windows
 2012-10-24 10:35:07 +02:00
Anatoliy Belsky
b48e163c35 enabled libxpm for gd on windows 2012-10-24 10:26:27 +02:00
Xinchen Hui
7e2c87bf2b Add missed file 2012-10-24 10:34:44 +08:00
ULF WENDEL
7c00017671 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  commented out the HHC_LOCATION line, as there are no easy to use alternatives for hhc.exe on linux. we should either run the chm build on a windows box(maybe on the replacement of oti1), or look into running it through wine see http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm for details. I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot file cannot be found.
 2012-10-23 15:14:59 +02:00
Ferenc Kovacs
240f8d06de commented out the HHC_LOCATION line, as there are no easy to use alternatives for 
hhc.exe on linux.
we should either run the chm build on a windows box(maybe on the replacement of oti1),
or look into running it through wine see
http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm
for details.
I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot
file cannot be found.
 2012-10-25 17:11:13 +02:00
ULF WENDEL
b8595e1d40 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix for bug #62820
 2012-10-23 15:14:45 +02:00
ULF WENDEL
0737be7e7b Fix for bug #62820 2012-10-23 15:13:57 +02:00
ULF WENDEL
38b632dd7c Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)
 2012-10-23 13:16:12 +02:00
Anatoliy Belsky
f962260081 merged changes for bug #63297 from 5.3 2012-10-25 09:40:21 +02:00
Anatoliy Belsky
9a6d8e250a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed a typo in the error message
 2012-10-25 09:36:26 +02:00
Anatoliy Belsky
6e23cfeba4 fixed a typo in the error message 2012-10-25 09:26:44 +02:00
ULF WENDEL
e7fc671dc0 Deprecating undocumented function alias, related to bug #63295 2012-10-23 12:02:58 +02:00
Gustavo Lopes
e7e57aea0a Use if_nametoindex in Vista 
I missed this instance in bf19838c.
 2012-10-23 11:52:31 +02:00
Xinchen Hui
ad476bde9b Merge branch 'PHP-5.4' 2012-10-23 17:29:28 +08:00
Xinchen Hui
22d4205783 Update test script 2012-10-23 17:28:52 +08:00
ULF WENDEL
84ab603fc7 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Add missed file
  Use if_nametoindex in Vista
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)
  fix crashes in newly introduced macros when normal trace is disabled but memory traced is enabled.
 2012-10-23 11:18:43 +02:00
Anatoliy Belsky
f734c0a7ca Merge branch 'PHP-5.4' 
* PHP-5.4:
  merged changes for bug #63297 from 5.3

Conflicts:
	NEWS
 2012-10-25 09:42:18 +02:00
Anatoliy Belsky
0d5c032470 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixed a typo in the error message
 2012-10-25 09:36:44 +02:00
Xinchen Hui
70e0624f6f Merge branch 'PHP-5.4' 2012-10-23 16:36:36 +08:00
Xinchen Hui
0b8b264107 Test for #63336, xfail now 2012-10-23 16:35:56 +08:00
Xinchen Hui
0cce2a1e76 Merge branch 'PHP-5.4' 2012-10-23 11:35:20 +08:00
Xinchen Hui
74228c5151 Fixed bug #63305 (zend_mm_heap corrupted with traits) 2012-10-23 11:34:25 +08:00
Andrey Hristov
91ce3764f0 Merge branch 'master' of ssh://git.php.net/php-src 2012-10-22 14:36:16 +02:00
Andrey Hristov
27e0999843 fix crashes in newly introduced macros when normal trace is disabled but 
memory traced is enabled.
 2012-10-22 14:35:35 +02:00
ULF WENDEL
77fd708a0b Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src: (22 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  update NEWS
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  ...
 2012-10-22 13:38:02 +02:00
ULF WENDEL
7d9114f2b2 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src: (27 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  updated NEWS
  update NEWS
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  add protection against core dumps if the underlying library returns 0x0 for some reason
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  ...
 2012-10-22 13:35:06 +02:00
Christopher Jones
0afca66958 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-10-21 22:22:07 -07:00
Christopher Jones
7d59b2264e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-10-21 22:21:46 -07:00
Christopher Jones
dbb72de6c7 Re-fixed bug #60901 (Improve "tail" syntax for AIX installation) 
The original fix broke Solaris installs of OCI8
 2012-10-21 22:17:47 -07:00
Anatoliy Belsky
df82bf8a12 updated NEWS 2012-10-19 10:02:37 +02:00
Anatoliy Belsky
3f9cd82fa6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  update NEWS
 2012-10-19 10:00:55 +02:00
Anatoliy Belsky
cbb857f8b9 update NEWS 2012-10-19 09:58:46 +02:00
Anatoliy Belsky
9692e4bca3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated NEWS
 2012-10-19 09:57:17 +02:00
Anatoliy Belsky
dfb1956f1a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated NEWS
 2012-10-19 09:57:00 +02:00
Anatoliy Belsky
7293cb7250 updated NEWS 2012-10-19 09:56:02 +02:00
Anatoliy Belsky
8b0704618f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #63284 PCRE upgrade to 8.31
 2012-10-19 09:52:43 +02:00
Anatoliy Belsky
d2fa182f25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63284 PCRE upgrade to 8.31
 2012-10-19 09:51:58 +02:00